Capabilities fixing and cleanup

lsuits · Feb 1, 2017 · 6a7a364 · 6a7a364
1 parent 07f563f
commit 6a7a364
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 15 deletions.
diff --git a/category_settings.php b/category_settings.php
@@ -32,7 +32,7 @@
 $PAGE->set_context($context);
 
 require_login();
-require_capability('local/cas_help_links:editglobalsettings', $context);
+require_capability('local/cas_help_links:editcategorysettings', $context);
 
 //////////////////////////////////////////////////////////
 /// 

diff --git a/classes/url_generator.php b/classes/url_generator.php
@@ -45,7 +45,7 @@ public static function getUrlForUser($user_id) {
         if (\ues_user::is_teacher($user_id)) {
             // return edit link
             return self::getCourseEditHelpUrl();
-        } else if (has_capability('local/cas_help_links:editglobalsettings', context_system::instance())) {
+        } else if (has_capability('local/cas_help_links:editcategorysettings', context_system::instance())) {
             return self::getCategoryEditHelpUrl(); 
         } else {
             //  otherwise rdo not display

diff --git a/db/access.php b/db/access.php
@@ -25,21 +25,11 @@
 defined('MOODLE_INTERNAL') || die();
 
 $capabilities = array(
-
-    'local/cas_help_links:editglobalsettings' => array(
-        'captype' => 'write',
-        'contextlevel' => CONTEXT_SYSTEM,
-        'archetypes' => array(
-            'user' => CAP_ALLOW
-        ),
-    ),
-
     'local/cas_help_links:editcategorysettings' => array(
         'captype' => 'write',
         'contextlevel' => CONTEXT_SYSTEM,
         'archetypes' => array(
-            'user' => CAP_ALLOW
+            'coursecreator' => CAP_ALLOW
         ),
     ),
-
 );
diff --git a/settings.php b/settings.php
@@ -22,7 +22,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-if (is_siteadmin() || has_capability('local/cas_help_links:editglobalsettings', context_system::instance())) {
+if (is_siteadmin()) {
 
     require_once(dirname(__FILE__) . '/../../config.php');
     require_once($CFG->libdir . '/adminlib.php');

diff --git a/version.php b/version.php
@@ -22,7 +22,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2017013101;
+$plugin->version   = 2017020101;
 $plugin->requires  = 2014051200;
 $plugin->cron      = 0;
 $plugin->component = 'local_cas_help_links';