Hide some outcomes stuff when $CFG->enableoutcomes is off

diff --git a/grade/edit/outcome/index.php b/grade/edit/outcome/index.php
index 8fe76d41ebcb2fd5a2efb15debd9564dfb3db16b..c9dc8df04d28494be50c2ca0105822ad0dd89fe7 100644 (file)
--- a/grade/edit/outcome/index.php
+++ b/grade/edit/outcome/index.php
@@ -17,6 +17,10 @@ if ($courseid) {
     $context = get_context_instance(CONTEXT_COURSE, $course->id);
     require_capability('moodle/grade:manage', $context);
 
+    if (empty($CFG->enableoutcomes)) {
+        redirect('../../index.php?id='.$courseid);
+    }
+
 } else {
     require_once $CFG->libdir.'/adminlib.php';
     admin_externalpage_setup('outcomes');

diff --git a/grade/edit/tree/index.php b/grade/edit/tree/index.php
index 95febd76f768ece1656e4bd5cf0b58ee616b13e6..da3ed1fc76e29bea9191918d3f9fb98069e2de8d 100644 (file)
--- a/grade/edit/tree/index.php
+++ b/grade/edit/tree/index.php
@@ -150,7 +150,9 @@ if ($moving) {
 } else {
     print_single_button('category.php', array('courseid'=>$course->id), get_string('addcategory', 'grades'), 'get');
     print_single_button('item.php', array('courseid'=>$course->id), get_string('additem', 'grades'), 'get');
-    print_single_button('outcomeitem.php', array('courseid'=>$course->id), get_string('addoutcomeitem', 'grades'), 'get');
+    if (!empty($CFG->enableoutcomes)) {
+        print_single_button('outcomeitem.php', array('courseid'=>$course->id), get_string('addoutcomeitem', 'grades'), 'get');
+    }
     //print_single_button('index.php', array('id'=>$course->id, 'action'=>'autosort'), get_string('autosort', 'grades'), 'get');
     print_single_button('index.php', array('id'=>$course->id, 'action'=>'synclegacy'), get_string('synclegacygrades', 'grades'), 'get');
 }

diff --git a/grade/edit/tree/outcomeitem.php b/grade/edit/tree/outcomeitem.php
index 14d1e55bb7bb3f0efacfbfb4bd8fe34ca5396aaa..e53eeaa0b0a3ca86899764af3a92c6e8ed28ced2 100644 (file)
--- a/grade/edit/tree/outcomeitem.php
+++ b/grade/edit/tree/outcomeitem.php
@@ -16,13 +16,14 @@ require_login($course);
 $context = get_context_instance(CONTEXT_COURSE, $course->id);
 require_capability('moodle/grade:manage', $context);
 
+
 // default return url
 $gpr = new grade_plugin_return();
 $returnurl = $gpr->get_return_url('index.php?id='.$course->id);
 
 $mform = new edit_outcomeitem_form(null, array('gpr'=>$gpr));
 
-if ($mform->is_cancelled()) {
+if ($mform->is_cancelled() || empty($CFG->enableoutcomes)) {
     redirect($returnurl);
 }
 

diff --git a/grade/lib.php b/grade/lib.php
index 47c755520171396afe98763e2c26e8e13caf0bb7..a63e3a34d71306022b4c16c65ccccc9cda51400b 100644 (file)
--- a/grade/lib.php
+++ b/grade/lib.php
@@ -114,7 +114,7 @@ function print_grade_plugin_selector($courseid, $active_type, $active_plugin, $r
             $menu[$url] = get_string('scales');
         }
 
-        if (has_capability('moodle/grade:manage', $context) or has_capability('course:update', $context)) {
+        if (!empty($CFG->enableoutcomes) && (has_capability('moodle/grade:manage', $context) or has_capability('course:update', $context))) {
             if (has_capability('moodle/grade:manage', $context)) {
                 $url = 'edit/outcome/index.php?id='.$courseid;
             } else {