MDL-64523 core_access: Improve the title of the delete role links

moodle · May 24, 2019 · 6786f6b · 6786f6b
1 parent a866c5c
commit 6786f6b
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/admin/roles/classes/permissions_table.php b/admin/roles/classes/permissions_table.php
@@ -96,7 +96,7 @@ protected function add_row_cells($capability) {
                                   "linkclass" => "preventlink", "adminurl" => $adminurl->out(), "icon" => "", "iconalt" => "");
                 if (isset($overridableroles[$id]) and ($allowoverrides or ($allowsafeoverrides and is_safe_capability($capability)))) {
                     $templatecontext['icon'] = 't/delete';
-                    $templatecontext['iconalt'] = get_string('delete');
+                    $templatecontext['iconalt'] = get_string('deletexrole', 'core_role', $name);
                 }
                 $neededroles[$id] = $renderer->render_from_template('core/permissionmanager_role', $templatecontext);
             }
@@ -109,7 +109,7 @@ protected function add_row_cells($capability) {
                                 "icon" => "", "iconalt" => "");
                 if (isset($overridableroles[$id]) and prohibit_is_removable($id, $context, $capability->name)) {
                     $templatecontext['icon'] = 't/delete';
-                    $templatecontext['iconalt'] = get_string('delete');
+                    $templatecontext['iconalt'] = get_string('deletexrole', 'core_role', $name);
                 }
                 $forbiddenroles[$id] = $renderer->render_from_template('core/permissionmanager_role', $templatecontext);
             }

diff --git a/admin/roles/permissions.php b/admin/roles/permissions.php
@@ -213,7 +213,7 @@
 $PAGE->requires->strings_for_js(
                                 array('roleprohibitinfo', 'roleprohibitheader', 'roleallowinfo', 'roleallowheader',
                                     'confirmunassigntitle', 'confirmroleunprohibit', 'confirmroleprevent', 'confirmunassignyes',
-                                    'confirmunassignno'), 'core_role');
+                                    'confirmunassignno', 'deletexrole'), 'core_role');
 $PAGE->requires->js_call_amd('core/permissionmanager', 'initialize', array($arguments));
 $table = new core_role_permissions_table($context, $contextname, $allowoverrides, $allowsafeoverrides, $overridableroles);
 echo $OUTPUT->box_start('generalbox capbox');

diff --git a/lib/amd/build/permissionmanager.min.js b/lib/amd/build/permissionmanager.min.js
diff --git a/lib/amd/src/permissionmanager.js b/lib/amd/src/permissionmanager.js
@@ -105,12 +105,14 @@ define(['jquery', 'core/config', 'core/notification', 'core/templates', 'core/yu
                         templatedata.linkclass = 'preventlink';
                         templatedata.action = 'prevent';
                         templatedata.icon = 't/delete';
+                        templatedata.iconalt = M.util.get_string('deletexrole', 'core_role', overideableroles[roleid]);
                         break;
                     case 'prohibit':
                         templatedata.spanclass = 'forbidden';
                         templatedata.linkclass = 'unprohibitlink';
                         templatedata.action = 'unprohibit';
                         templatedata.icon = 't/delete';
+                        templatedata.iconalt = M.util.get_string('deletexrole', 'core_role', overideableroles[roleid]);
                         break;
                     case 'prevent':
                         row.find('a[data-role-id="' + roleid + '"]').first().closest('.allowed').remove();