Removed duplicate capability moodle/course:managequestions MDL-6610

diff --git a/blocks/admin/block_admin.php b/blocks/admin/block_admin.php
index 46001a8c134a90b5af6c9a0a293b9a487d47d995..c6e4dc8793360f56541c223dd5a90feb42984081 100644 (file)
--- a/blocks/admin/block_admin.php
+++ b/blocks/admin/block_admin.php
@@ -117,7 +117,7 @@ class block_admin extends block_list {
         }
         
     /// Manage questions
-        if (has_capability('moodle/course:managequestions', $context)) {
+        if (has_capability('moodle/question:manage', $context)) {
             $this->content->items[]='<a href="'.$CFG->wwwroot.'/question/edit.php?courseid='.$this->instance->pageid.'&amp;clean=true">'.get_string('questions', 'quiz').'</a>';
             $this->content->icons[]='<img src="'.$CFG->pixpath.'/i/questions.gif" alt="" />';
         }

diff --git a/lang/en_utf8/role.php b/lang/en_utf8/role.php
index 3c627c6faec3413bbf77f4c62b88d3052a5dec10..1a1593a848052ad104ad1b54eb366869d1c96567 100644 (file)
--- a/lang/en_utf8/role.php
+++ b/lang/en_utf8/role.php
@@ -102,7 +102,6 @@ $string['course:managescales'] = 'Manage scales';
 $string['course:managegroups'] = 'Manage groups';
 $string['course:managefiles'] = 'Manage files';
 $string['course:managemetacourse'] = 'Manage metacourse';
-$string['course:managequestions'] = 'Manage questions';
 $string['course:reset'] = 'Reset course';
 $string['course:sectionvisibility'] = 'Control section visibility';
 $string['course:viewhiddensections'] = 'View hidden sections';

diff --git a/lib/db/access.php b/lib/db/access.php
index f93a776b695b3ec816cbfb2e3a6b1f516c79bb0d..15bf87517aa35d77be86d15be0108c3c4681c4d1 100644 (file)
--- a/lib/db/access.php
+++ b/lib/db/access.php
@@ -629,22 +629,6 @@ $moodle_capabilities = array(
         )
     ),
 
-    'moodle/course:managequestions' => array(
-
-        'riskbitmask' => RISK_XSS,
-
-        'captype' => 'write',
-        'contextlevel' => CONTEXT_COURSE,
-        'legacy' => array(
-            'guest' => CAP_PREVENT,
-            'student' => CAP_PREVENT,
-            'teacher' => CAP_ALLOW,
-            'editingteacher' => CAP_ALLOW,
-            'coursecreator' => CAP_ALLOW,
-            'admin' => CAP_ALLOW
-        )
-    ),
-
     'moodle/course:manageactivities' => array(
 
         'riskbitmask' => RISK_XSS,

diff --git a/question/editlib.php b/question/editlib.php
index d33ac891ac3b3c5f6667df5a5866b658191f408c..543028cbb9b6594eac761545b1ebfaeadf1e2bb4 100644 (file)
--- a/question/editlib.php
+++ b/question/editlib.php
@@ -106,7 +106,7 @@ function question_category_menu($courseid, $published=false) {
         $publish = "OR publish = '1'";
     }
 
-    if (!has_capability('moodle/course:managequestions', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
+    if (!has_capability('moodle/question:manage', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
         $categories = get_records_select("question_categories", "course = '$courseid' $publish", 'parent, sortorder, name ASC');
     } else {
         $categories = get_records_select("question_categories", '', 'parent, sortorder, name ASC');

diff --git a/question/import.php b/question/import.php
index 4b615a2823787241411972c0e033cd4f5d6a51d9..0ec1eaf54a4bb37d7d97937d6b5479db6d1dc82d 100644 (file)
--- a/question/import.php
+++ b/question/import.php
@@ -183,7 +183,7 @@
     print_heading_with_help($txt->importquestions, "import", "quiz");
 
     /// Get all the existing categories now
-    if (has_capability('moodle/course:managequestions', get_context_instance(CONTEXT_SYSTEM, SITEID))) { // the admin can import into all categories
+    if (has_capability('moodle/question:manage', get_context_instance(CONTEXT_SYSTEM, SITEID))) { // the admin can import into all categories
         if (!$categories = get_records_select("question_categories", "course = '{$course->id}' OR publish = '1'", "parent, sortorder, name ASC")) {
             error("Could not find any question categories!"); // Something is really wrong
         }

diff --git a/question/type/rqp/types.php b/question/type/rqp/types.php
index 4b26ed2dd24d437b9a93ebece715d9542c5a2ecc..3ca4ce7d7664629107d1a2a08ef6925a86d8c153 100644 (file)
--- a/question/type/rqp/types.php
+++ b/question/type/rqp/types.php
@@ -13,7 +13,7 @@
 
     // Check user admin
     require_login();
-    require_capability('moodle/course:managequestions', get_context_instance(CONTEXT_SYSTEM, SITEID));
+    require_capability('moodle/question:manage', get_context_instance(CONTEXT_SYSTEM, SITEID));
 
     if (!$site = get_site()) {
         error('Site isn\'t defined!');