MDL-9061 - Only show global assign roles warning if you are assigning roles in the...

diff --git a/admin/roles/assign.php b/admin/roles/assign.php
index fc21cc8fba631a6695d89f8d0831749561732397..5bd81642e1f7c5052507f6ba46eaa1fcd738b188 100755 (executable)
--- a/admin/roles/assign.php
+++ b/admin/roles/assign.php
@@ -210,8 +210,10 @@
         print_heading_with_help(get_string('assignroles', 'role'), 'assignroles');
     }
 
-    print_simple_box(get_string('globalroleswarning', 'role'), 'center', '700');
-
+    if ($context->contextlevel==CONTEXT_SYSTEM) {
+        print_box(get_string('globalroleswarning', 'role'));
+    }
+    
     if ($roleid) {        /// prints a form to swap roles
 
     /// Get all existing participants in this context.

diff --git a/admin/settings/users.php b/admin/settings/users.php
index 89019cbd0bce7594bb4c338bed8c2750e0845331..8ea22652d505a0ab3d3949ed8e4f98b7ba1994a8 100644 (file)
--- a/admin/settings/users.php
+++ b/admin/settings/users.php
@@ -23,7 +23,7 @@ $ADMIN->add('accounts', new admin_externalpage('profilefields', get_string('prof
 $ADMIN->add('users', new admin_category('roles', get_string('permissions', 'role')));
 $ADMIN->add('roles', new admin_externalpage('defineroles', get_string('defineroles', 'role'), "$CFG->wwwroot/$CFG->admin/roles/manage.php"));
 $sitecontext = get_context_instance(CONTEXT_SYSTEM);
-$ADMIN->add('roles', new admin_externalpage('assignroles', get_string('assignroles', 'role'), "$CFG->wwwroot/$CFG->admin/roles/assign.php?contextid=" . $sitecontext->id));
+$ADMIN->add('roles', new admin_externalpage('assignroles', get_string('assignglobalroles', 'role'), "$CFG->wwwroot/$CFG->admin/roles/assign.php?contextid=" . $sitecontext->id));
 
 
 // "userpolicies" settingpage

diff --git a/lang/en_utf8/role.php b/lang/en_utf8/role.php
index e6a97f01b3bc19bb5b97b84383c82ecabb0080ab..0fc53ab3c24bb799efed2e8b9f9c8eaa55da85a9 100644 (file)
--- a/lang/en_utf8/role.php
+++ b/lang/en_utf8/role.php
@@ -7,6 +7,7 @@ $string['allow'] = 'Allow';
 $string['allowassign'] = 'Allow role assignments';
 $string['allowoverride'] = 'Allow role overrides';
 $string['assignroles'] = 'Assign roles';
+$string['assignglobalroles'] = 'Assign global roles';
 $string['blog:create'] = 'Create new blog entries';
 $string['blog:manageentries'] = 'Edit and manage entries';
 $string['blog:manageofficialtags'] = 'Manage official tags';