mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-21 16:32:18 +02:00
Code Issues Projects Releases Wiki Activity

MDL-68583 core_course: Fix category delete action menu.

Browse Source 
Deletion form offers user a deletion with contents move option, it is
available when full deletion is not permitted. Action menu should take
this into account too and allow user to reach the form.
This commit is contained in:
Ruslan Kabalin 2020-05-02 16:02:51 +01:00
parent 68fd8d8bdf
commit 4993775900
3 changed files with 182 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
course/classes/management/helper.php
View File

@ -244,7 +244,7 @@ class helper {
}
// Delete.
if ($category->can_delete_full()) {
if (!empty($category->move_content_targets_list()) || $category->can_delete_full()) {
$actions['delete'] = array(
'url' => new \moodle_url($baseurl, array('action' => 'deletecategory')),
'icon' => new \pix_icon('t/delete', new \lang_string('delete')),

50
course/tests/behat/behat_course.php
View File

@ -1927,6 +1927,56 @@ class behat_course extends behat_base {
$node->find('css', 'a.categoryname')->click();
}
/**
* Locates a category in the course category management interface and then opens action menu for it.
*
* @Given /^I open the action menu for "(?P<name_string>(?:[^"]|\\")*)" in management category listing$/
*
* @param string $name The name of the category as it is displayed in the management interface.
*/
public function i_open_the_action_menu_for_item_in_management_category_listing($name) {
$node = $this->get_management_category_listing_node_by_name($name);
$node->find('xpath', "//*[contains(@class, 'category-item-actions')]//a[@data-toggle='dropdown']")->click();
}
/**
* Checks that the specified category actions menu contains an item.
*
* @Then /^"(?P<name_string>(?:[^"]|\\")*)" category actions menu should have "(?P<menu_item_string>(?:[^"]|\\")*)" item$/
*
* @param string $name
* @param string $menuitem
* @throws Behat\Mink\Exception\ExpectationException
*/
public function category_actions_menu_should_have_item($name, $menuitem) {
$node = $this->get_management_category_listing_node_by_name($name);
$notfoundexception = new ExpectationException('"' . $name . '" doesn\'t have a "' .
$menuitem . '" item', $this->getSession());
$this->find('named_partial', ['link', $menuitem], $notfoundexception, $node);
}
/**
* Checks that the specified category actions menu does not contain an item.
*
* @Then /^"(?P<name_string>(?:[^"]|\\")*)" category actions menu should not have "(?P<menu_item_string>(?:[^"]|\\")*)" item$/
*
* @param string $name
* @param string $menuitem
* @throws Behat\Mink\Exception\ExpectationException
*/
public function category_actions_menu_should_not_have_item($name, $menuitem) {
$node = $this->get_management_category_listing_node_by_name($name);
try {
$this->find('named_partial', ['link', $menuitem], false, $node);
throw new ExpectationException('"' . $name . '" has a "' . $menuitem .
'" item when it should not', $this->getSession());
} catch (ElementNotFoundException $e) {
// This is good, the menu item should not be there.
}
}
/**
* Go to the course participants
*

131
course/tests/behat/category_management.feature
View File

@ -5,6 +5,7 @@ Feature: Test category management actions
Test we can create a sub category
Test we can edit a category
Test we can delete a category
Test deleting categories interface when user permissions are restricted
Test we can move a category
Test we can assign roles within a category
Test we can set permissions on a category
@ -103,6 +104,136 @@ Feature: Test category management actions
And I should not see "Cat 3" in the "#category-listing ul" "css_element"
And I should see "Course 1" in the "#course-listing ul.course-list" "css_element"
Scenario: Test deleting categories action is not listed when permissions are restricted.
Given the following "users" exist:
| username | firstname | lastname |
| manager | Manager | Manager |
And the following "categories" exist:
| name | category | idnumber |
| Cat 1 | 0 | CAT1 |
| Cat 2 | 0 | CAT2 |
And the following "courses" exist:
| category | fullname | shortname |
| CAT1 | Course 1 | C1 |
And the following "system role assigns" exist:
| user | role | contextlevel |
| manager | manager | System |
And the following "permission overrides" exist:
| capability | permission | role | contextlevel | reference |
| moodle/course:delete | Prevent | manager | Course | C1 |
| moodle/course:create | Prevent | manager | System | |
When I log in as "manager"
And I go to the courses management page
Then I should see the "Course categories and courses" management page
And I should see "Cat 1" in the "#category-listing ul" "css_element"
And I should see "Cat 2" in the "#category-listing ul" "css_element"
And I open the action menu for "Cat 1" in management category listing
And "Cat 1" category actions menu should not have "Delete" item
Scenario: Test deleting categories interface when course create permission is restricted in system.
Given the following "users" exist:
| username | firstname | lastname |
| manager | Manager | Manager |
And the following "categories" exist:
| name | category | idnumber |
| Cat 1 | 0 | CAT1 |
| Cat 2 | 0 | CAT2 |
And the following "courses" exist:
| category | fullname | shortname |
| CAT1 | Course 1 | C1 |
And the following "system role assigns" exist:
| user | role | contextlevel |
| manager | manager | System |
And the following "permission overrides" exist:
| capability | permission | role | contextlevel | reference |
| moodle/course:delete | Allow | manager | Course | C1 |
| moodle/course:create | Prevent | manager | System | |
When I log in as "manager"
And I go to the courses management page
And I open the action menu for "Cat 1" in management category listing
Then "Cat 1" category actions menu should have "Delete" item
And I click on "delete" action for "Cat 1" in management category listing
# Redirect
And I should see "Delete category: Cat 1"
And I should see "Contents of Cat 1"
And I should see "Delete all - cannot be undone"
And "What to do" "select" should not exist
And "Move into" "select" should not exist
And I press "Cancel"
Scenario: Test deleting categories interface when course delete permission is restricted for category.
Given the following "users" exist:
| username | firstname | lastname |
| manager | Manager | Manager |
And the following "categories" exist:
| name | category | idnumber |
| Cat 1 | 0 | CAT1 |
| Cat 2 | 0 | CAT2 |
And the following "courses" exist:
| category | fullname | shortname |
| CAT1 | Course 1 | C1 |
And the following "system role assigns" exist:
| user | role | contextlevel |
| manager | manager | System |
And the following "permission overrides" exist:
| capability | permission | role | contextlevel | reference |
| moodle/course:delete | Prevent | manager | Course | C1 |
| moodle/course:create | Allow | manager | System | |
When I log in as "manager"
And I go to the courses management page
And I open the action menu for "Cat 1" in management category listing
Then "Cat 1" category actions menu should have "Delete" item
And I click on "delete" action for "Cat 1" in management category listing
# Redirect
And I should see "Delete category: Cat 1"
And I should see "Contents of Cat 1"
And I should see "Move contents to another category"
And "What to do" "select" should not exist
And "Move into" "select" should exist
And the "Move into" select box should contain "Cat 2"
And the "Move into" select box should contain "Miscellaneous"
And I press "Cancel"
@javascript
Scenario: Test deleting categories interface when course create permissions are restricted for some categories.
Given the following "users" exist:
| username | firstname | lastname |
| manager | Manager | Manager |
And the following "categories" exist:
| name | category | idnumber |
| Cat 1 | 0 | CAT1 |
| Cat 2 | 0 | CAT2 |
And the following "courses" exist:
| category | fullname | shortname |
| CAT1 | Course 1 | C1 |
And the following "system role assigns" exist:
| user | role | contextlevel |
| manager | manager | System |
And the following "permission overrides" exist:
| capability | permission | role | contextlevel | reference |
| moodle/course:delete | Allow | manager | Course | C1 |
| moodle/course:create | Allow | manager | System | |
| moodle/course:create | Prevent | manager | Category | CAT2 |
When I log in as "manager"
And I go to the courses management page
And I open the action menu for "Cat 1" in management category listing
Then "Cat 1" category actions menu should have "Delete" item
And I click on "delete" action for "Cat 1" in management category listing
# Redirect
And I should see "Delete category: Cat 1"
And I should see "Contents of Cat 1"
And "What to do" "select" should exist
And "Move into" "select" should exist
And the "Move into" select box should not contain "Cat 2"
And the "Move into" select box should contain "Miscellaneous"
And I set the field "What to do" to "Delete all - cannot be undone"
And "Move into" "select" should not be visible
And I press "Cancel"
Scenario: Test I can assign roles for a category through the management interface.
Given the following "categories" exist:
| name | category | idnumber |