Merge branch 'MDL-73178' of https://github.com/paulholden/moodle
This commit is contained in:
@@ -51,7 +51,7 @@ class core_role_permissions_table extends core_role_capability_table_base {
|
||||
$this->overridableroles = $overridableroles;
|
||||
|
||||
$roles = get_all_roles($context);
|
||||
$this->roles = role_fix_names(array_reverse($roles, true), $context, ROLENAME_ALIAS, true);
|
||||
$this->roles = role_fix_names(array_reverse($roles, true), $context, ROLENAME_BOTH, true);
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -83,10 +83,10 @@ Feature: Edit capabilities
|
||||
And I should see "Teacher < \"editing\" (Non-editing teacher)" in the "Teaching Assistant" "table_row"
|
||||
And I should see "Studier & 'learner' (Student)" in the "Student One" "table_row"
|
||||
And I am on the "C1" "permissions" page
|
||||
And I should see "Teacher >= editing" in the "mod/forum:replypost" "table_row"
|
||||
And I should see "Teacher < \"editing\"" in the "mod/forum:replypost" "table_row"
|
||||
And I should see "Studier & 'learner'" in the "mod/forum:replypost" "table_row"
|
||||
And I should see "Teacher >= editing (Teacher)" in the "mod/forum:replypost" "table_row"
|
||||
And I should see "Teacher < \"editing\" (Non-editing teacher)" in the "mod/forum:replypost" "table_row"
|
||||
And I should see "Studier & 'learner' (Student)" in the "mod/forum:replypost" "table_row"
|
||||
And I follow "Prohibit"
|
||||
And "Teacher >= editing" "button" in the "Prohibit role" "dialogue" should be visible
|
||||
And "Teacher < \"editing\"" "button" in the "Prohibit role" "dialogue" should be visible
|
||||
And "Studier & 'learner'" "button" in the "Prohibit role" "dialogue" should be visible
|
||||
And "Teacher >= editing (Teacher)" "button" in the "Prohibit role" "dialogue" should be visible
|
||||
And "Teacher < \"editing\" (Non-editing teacher)" "button" in the "Prohibit role" "dialogue" should be visible
|
||||
And "Studier & 'learner' (Student)" "button" in the "Prohibit role" "dialogue" should be visible
|
||||
|
||||
Reference in New Issue
Block a user