L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-80313' of https://github.com/stronk7/moodle

Browse Source
This commit is contained in:
Jun Pataleta
2024-01-11 11:32:40 +08:00
parent 8c8f98b244 22831808cd
commit d077ba647d
5 changed files with 502 additions and 455 deletions
Download Patch File Download Diff File Expand all files Collapse all files
composer.json
+3 -3
View File
@@ -8,13 +8,13 @@
"phpunit/phpunit": "9.5.*",
"mikey179/vfsstream": "1.6.*",
"behat/mink": "^1.10.0",
"friends-of-behat/mink-extension": "^2.7.2",
"friends-of-behat/mink-extension": "^2.7.4",
"behat/mink-browserkit-driver": "^2.1.0",
"symfony/process": "^4.4 || ^5.0 || ^6.0",
"symfony/http-client": "^4.4 || ^5.0 || ^6.0",
"symfony/mime": "^4.4 || ^5.0 || ^6.0",
"behat/behat": "3.13.*",
"oleg-andreyev/mink-phpwebdriver": "1.2.*",
"oleg-andreyev/mink-phpwebdriver": "1.3.*",
"filp/whoops": "^2.15"
},
"autoload-dev": {
@@ -25,7 +25,7 @@
"minimum-stability": "dev",
"prefer-stable": true,
"require": {
"php": ">=8.0.0",
"php": ">=8.1.0",
"ext-iconv": "*",
"ext-mbstring": "*",
"ext-curl": "*",
composer.lock
Generated
+488 -441
View File
File diff suppressed because it is too large Load Diff
course/templates/activity_list.mustache
+1 -1
View File
@@ -31,7 +31,7 @@
placeholder="{{#str}}search, core {{/str}}" {{#query}} value="{{query}}" autofocus {{/query}}
>
<div class="input-group-append">
<button type="submit" class="btn btn-outline-secondary rounded-right" type="button">
<button type="submit" class="btn btn-outline-secondary rounded-right">
<i class="icon fa fa-search fa-fw m-0" aria-hidden="true"></i>
<span class="sr-only">{{#str}}submitsearch, course {{/str}}</span>
</button>
lib/db/upgrade.php
+2 -2
View File
@@ -91,12 +91,12 @@ function xmldb_main_upgrade($oldversion) {
// Always keep this upgrade step with version being the minimum
// allowed version to upgrade from (v4.1.2 right now).
if ($oldversion < 2021112802) {
if ($oldversion < 2022112802) {
// Just in case somebody hacks upgrade scripts or env, we really can not continue.
echo("You need to upgrade to 4.1.2 or higher first!\n");
exit(1);
// Note this savepoint is 100% unreachable, but needed to pass the upgrade checks.
upgrade_main_savepoint(true, 2021112802);
upgrade_main_savepoint(true, 2022112802);
}
// Automatically generated Moodle v4.1.0 release upgrade line.
mod/forum/tests/behat/forum_subscriptions_default.feature
+8 -8
View File
@@ -28,11 +28,11 @@ Feature: A user can control their default discussion subscription settings
Given I am on the "Test forum name" "forum activity" page logged in as student1
When I click on "Add discussion topic" "link"
And I click on "Advanced" "button"
Then "input[name=discussionsubscribe][checked=checked]" "css_element" should exist
Then "input[name=discussionsubscribe]:checked" "css_element" should exist
And I am on the "Test forum name" "forum activity" page logged in as student2
And I click on "Add discussion topic" "link"
And I click on "Advanced" "button"
And "input[name=discussionsubscribe]:not([checked=checked])" "css_element" should exist
And "input[name=discussionsubscribe]:not(:checked)" "css_element" should exist
Scenario: Replying to an existing discussion in an optional forum follows user preferences
Given the following forum discussions exist in course "Course 1":
@@ -41,11 +41,11 @@ Feature: A user can control their default discussion subscription settings
And I am on the "Test forum name" "forum activity" page logged in as student1
And I follow "Test post subject"
When I follow "Reply"
Then "input[name=discussionsubscribe][checked=checked]" "css_element" should exist
Then "input[name=discussionsubscribe]:checked" "css_element" should exist
And I am on the "Test forum name" "forum activity" page logged in as student2
And I follow "Test post subject"
And I follow "Reply"
And "input[name=discussionsubscribe]:not([checked=checked])" "css_element" should exist
And "input[name=discussionsubscribe]:not(:checked)" "css_element" should exist
Scenario: Creating a new discussion in an automatic forum follows forum subscription
Given I am on the "Test forum name" "forum activity editing" page logged in as admin
@@ -55,11 +55,11 @@ Feature: A user can control their default discussion subscription settings
And I am on the "Test forum name" "forum activity" page logged in as student1
When I click on "Add discussion topic" "link"
And I click on "Advanced" "button"
Then "input[name=discussionsubscribe][checked=checked]" "css_element" should exist
Then "input[name=discussionsubscribe]:checked" "css_element" should exist
And I am on the "Test forum name" "forum activity" page logged in as student2
And I click on "Add discussion topic" "link"
And I click on "Advanced" "button"
And "input[name=discussionsubscribe][checked=checked]" "css_element" should exist
And "input[name=discussionsubscribe]:checked" "css_element" should exist
Scenario: Replying to an existing discussion in an automatic forum follows forum subscription
Given the following forum discussions exist in course "Course 1":
@@ -72,11 +72,11 @@ Feature: A user can control their default discussion subscription settings
And I am on the "Test forum name" "forum activity" page logged in as student1
And I follow "Test post subject"
When I follow "Reply"
Then "input[name=discussionsubscribe][checked=checked]" "css_element" should exist
Then "input[name=discussionsubscribe]:checked" "css_element" should exist
And I am on the "Test forum name" "forum activity" page logged in as student2
And I follow "Test post subject"
And I follow "Reply"
And "input[name=discussionsubscribe]:not([checked=checked])" "css_element" should exist
And "input[name=discussionsubscribe]:not(:checked)" "css_element" should exist
@javascript
Scenario: Replying to an existing discussion in an automatic forum which has been unsubscribed from follows user preferences