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

Merge branch 'MDL-78495-main_exclude_badges_from_recyclebin' of https://github.com/sharpchi/moodle

Browse Source
This commit is contained in:
Mihail Geshoski
2025-10-08 23:36:32 +08:00
parent 0438316226 28712cd4fb
commit eefbc05037
2 changed files with 31 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/admin/tool/recyclebin/classes/course_bin.php
+6
View File
@@ -145,6 +145,12 @@ class course_bin extends base_bin {
return;
}
// We never need badge information here.
if ($plan->setting_exists('badges')) {
$badges = $plan->get_setting('badges');
$badges->set_value(false);
}
$controller->execute_plan();
// We don't need the forced setting anymore, hence restore previous settings.
public/admin/tool/recyclebin/tests/behat/basic_functionality.feature
+25 -4
View File
@@ -39,11 +39,19 @@ Feature: Basic recycle bin functionality
| student2 | G1 |
| student2 | G2 |
And the following config values are set as admin:
| coursebinenable | 1 | tool_recyclebin |
| categorybinenable | 1 | tool_recyclebin |
| coursebinexpiry | 604800 | tool_recyclebin |
| coursebinenable | 1 | tool_recyclebin |
| categorybinenable | 1 | tool_recyclebin |
| coursebinexpiry | 604800 | tool_recyclebin |
| categorybinexpiry | 1209600 | tool_recyclebin |
| autohide | 0 | tool_recyclebin |
| autohide | 0 | tool_recyclebin |
And the following "core_badges > Badges" exist:
| name | course | description | image | status | type |
| My course 1 badge | C1 | Badge description | badges/tests/behat/badge.png | active | 2 |
| My course 2 badge | C2 | Badge description | badges/tests/behat/badge.png | active | 2 |
And the following "core_badges > Criterias" exist:
| badge | role |
| My course 1 badge | editingteacher |
| My course 2 badge | editingteacher |
Scenario: Restore a deleted assignment
Given I log in as "teacher1"
@@ -58,6 +66,14 @@ Feature: Basic recycle bin functionality
And I wait to be redirected
And I am on "Course 1" course homepage
And I should see "Test assign 1" in the "Section 1" "section"
# Check badges were not duplicated.
And I navigate to "Badges" in current page administration
And the following should exist in the "reportbuilder-table" table:
| Name | Badge status |
| My course 1 badge | Available |
And the following should not exist in the "reportbuilder-table" table:
| Name | Badge status |
| My course 1 badge | Not available |
@javascript
Scenario: Restore a deleted course
@@ -83,6 +99,11 @@ Feature: Basic recycle bin functionality
And "Student 1" "text" should exist in the "Group A" "table_row"
And "Student 2" "text" should exist in the "Group A" "table_row"
And "Student 2" "text" should exist in the "Group B" "table_row"
# Check badges are restored.
And I navigate to "Badges" in current page administration
And the following should exist in the "reportbuilder-table" table:
| Name | Badge status |
| My course 2 badge | Not available |
@javascript
Scenario: Deleting a single item from the recycle bin