MDL-18190

diff --git a/grade/edit/tree/category.php b/grade/edit/tree/category.php
index ea84d584b3b0db611bfdcef488dffabbac30263c..1cb26efb59b8405105320bf970d7d5f36e8f2b06 100644 (file)
--- a/grade/edit/tree/category.php
+++ b/grade/edit/tree/category.php
@@ -30,7 +30,6 @@ require_once 'category_form.php';
 
 $courseid = required_param('courseid', PARAM_INT);
 $id       = optional_param('id', 0, PARAM_INT); // grade_category->id
-$grade_item_id       = optional_param('grade_item_id', 0, PARAM_INT); // grade_item->id
 
 if (!$course = $DB->get_record('course', array('id' => $courseid))) {
     print_error('nocourseid');
@@ -133,7 +132,6 @@ if ($mform->is_cancelled()) {
     // If the user leaves these fields empty during creation of a category, we let the default values take effect
     // Otherwise, we let the user-entered grade item values take effect
     $grade_item = $grade_category->load_grade_item();
-    $grade_item_id = $grade_item->id;
     $grade_item_copy = fullclone($grade_item);
     grade_item::set_properties($grade_item, $itemdata);
 

diff --git a/grade/edit/tree/category_form.php b/grade/edit/tree/category_form.php
index 2ad053a89ad1aebb5b9e2ff481c8c49355cfb7e3..8b3a1d1768d2c993c129fb1f74948aef9f818035 100644 (file)
--- a/grade/edit/tree/category_form.php
+++ b/grade/edit/tree/category_form.php
@@ -260,9 +260,7 @@ class edit_category_form extends moodleform {
 
         // hidden params
         $mform->addElement('hidden', 'id', 0);
-        $mform->addElement('hidden', 'grade_item_id', 0);
         $mform->setType('id', PARAM_INT);
-        $mform->setType('grade_item_id', PARAM_INT);
 
         $mform->addElement('hidden', 'courseid', 0);
         $mform->setType('courseid', PARAM_INT);
@@ -312,7 +310,6 @@ class edit_category_form extends moodleform {
             $grade_category = grade_category::fetch(array('id'=>$id));
             $grade_item = $grade_category->load_grade_item();
 
-
             // remove agg coef if not used
             if ($grade_category->is_course_category()) {
                 if ($mform->elementExists('parentcategory')) {
@@ -376,8 +373,9 @@ class edit_category_form extends moodleform {
         }
 
 /// GRADE ITEM
-        if ($id = $mform->getElementValue('grade_item_id')) {
-            $grade_item = grade_item::fetch(array('id'=>$id));
+        if ($id = $mform->getElementValue('id')) {
+            $grade_category = grade_category::fetch(array('id'=>$id));
+            $grade_item = $grade_category->load_grade_item();
 
             if (!$grade_item->is_raw_used()) {
                 $mform->removeElement('grade_item_plusfactor');