MDL-12350 do not set parent cat when updating; merged from MOODLE_19_STABLE

diff --git a/grade/edit/tree/item.php b/grade/edit/tree/item.php
index 673c92411546b0668dea9ff7f7b6a61ffbd7caa2..6db3b6c5a99a4e5a909622d79053780cf2587fce 100644 (file)
--- a/grade/edit/tree/item.php
+++ b/grade/edit/tree/item.php
@@ -125,15 +125,15 @@ if ($data = $mform->get_data(false)) {
         $grade_item->itemtype = 'manual'; // all new items to be manual only
         $grade_item->insert();
 
+        // set parent if needed
+        if (isset($data->parentcategory)) {
+            $grade_item->set_parent($data->parentcategory, 'gradebook');
+        }
+
     } else {
         $grade_item->update();
     }
 
-    // set parent if needed
-    if (isset($data->parentcategory)) {
-        $grade_item->set_parent($data->parentcategory, 'gradebook');
-    }
-
     // update hiding flag
     if ($hiddenuntil) {
         $grade_item->set_hidden($hiddenuntil, false);

diff --git a/grade/edit/tree/outcomeitem.php b/grade/edit/tree/outcomeitem.php
index bc6334feab70998275dad5074501325707785b6d..c6df53980270a64712d78002353fff542e006719 100644 (file)
--- a/grade/edit/tree/outcomeitem.php
+++ b/grade/edit/tree/outcomeitem.php
@@ -186,10 +186,6 @@ if ($data = $mform->get_data(false)) {
 
     } else {
         $grade_item->update();
-        // set parent if needed
-        if (isset($data->parentcategory)) {
-            $grade_item->set_parent($data->parentcategory, 'gradebook');
-        }
     }
 
     // update hiding flag