Merge branch 'wip-MDL-59898-33' of git://github.com/abgreeve/moodle i…

…nto MOODLE_33_STABLE
moodle · Sep 7, 2017 · 42b8955 · 42b8955
2 parents 3909dc6 + 29786b2
commit 42b8955
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
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
@@ -104,11 +104,13 @@ define(['jquery', 'core/config', 'core/notification', 'core/templates', 'core/yu
                         templatedata.spanclass = 'allowed';
                         templatedata.linkclass = 'preventlink';
                         templatedata.action = 'prevent';
+                        templatedata.icon = 't/delete';
                         break;
                     case 'prohibit':
                         templatedata.spanclass = 'forbidden';
                         templatedata.linkclass = 'unprohibitlink';
                         templatedata.action = 'unprohibit';
+                        templatedata.icon = 't/delete';
                         break;
                     case 'prevent':
                         row.find('a[data-role-id="' + roleid + '"]').first().closest('.allowed').remove();