When editing old outcomes when outcomes are switched off, just treat …

…them like an ordinary scale item
moodle · Aug 1, 2007 · 9988d1b · 9988d1b
1 parent f3b783f
commit 9988d1b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/grade/edit/tree/item.php b/grade/edit/tree/item.php
@@ -28,7 +28,7 @@
 
 if ($item = get_record('grade_items', 'id', $id, 'courseid', $course->id)) {
     // redirect if outcomeid present
-    if (!empty($item->outcomeid)) {
+    if (!empty($item->outcomeid) && !empty($CFG->enableoutcomes)) {
         $url = $CFG->wwwroot.'/grade/edit/tree/outcome.php?id='.$id.'&amp;courseid='.$courseid;
         redirect($gpr->add_url_params($url));
     }

diff --git a/grade/lib.php b/grade/lib.php
@@ -601,7 +601,7 @@ function get_edit_icon($element, $gpr) {
             case 'item':
             case 'categoryitem':
             case 'courseitem':
-                if (empty($object->outcomeid)) {
+                if (empty($object->outcomeid) || empty($CFG->enableoutcomes)) {
                     $url = $CFG->wwwroot.'/grade/edit/tree/item.php?courseid='.$this->courseid.'&amp;id='.$object->id;
                 } else {
                     $url = $CFG->wwwroot.'/grade/edit/tree/outcomeitem.php?courseid='.$this->courseid.'&amp;id='.$object->id;