From fce387e46b51b1e075953d50fa3d6bb4cf1ebf26 Mon Sep 17 00:00:00 2001
From: Mikhail Janowski <mikhail@getsmarter.co.za>
Date: Mon, 25 Apr 2016 16:36:57 +0200
Subject: [PATCH] Fix MDL-53054 Change Hidden and Hidden until field names to
 match database column names Set hidden property if not set

---
 grade/edit/tree/category.php      |  4 ++++
 grade/edit/tree/category_form.php | 10 ++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/grade/edit/tree/category.php b/grade/edit/tree/category.php
index 206b12d..288e5f9 100644
--- a/grade/edit/tree/category.php
+++ b/grade/edit/tree/category.php
@@ -128,6 +128,10 @@
     if (!isset($data->aggregateoutcomes)) {
         $data->aggregateoutcomes = 0;
     }
+    if (!isset($data->hidden)) {
+        $data->hidden = 0;
+    }
+
     grade_category::set_properties($grade_category, $data);
 
     /// CATEGORY
diff --git a/grade/edit/tree/category_form.php b/grade/edit/tree/category_form.php
index b090740..18bfd1b 100644
--- a/grade/edit/tree/category_form.php
+++ b/grade/edit/tree/category_form.php
@@ -198,10 +198,10 @@ function definition() {
 
         /// hiding
         // advcheckbox is not compatible with disabledIf!
-        $mform->addElement('checkbox', 'grade_item_hidden', get_string('hidden', 'grades'));
-        $mform->addHelpButton('grade_item_hidden', 'hidden', 'grades');
-        $mform->addElement('date_time_selector', 'grade_item_hiddenuntil', get_string('hiddenuntil', 'grades'), array('optional'=>true));
-        $mform->disabledIf('grade_item_hidden', 'grade_item_hiddenuntil[off]', 'notchecked');
+        $mform->addElement('checkbox', 'hidden', get_string('hidden', 'grades'));
+        $mform->addHelpButton('hidden', 'hidden', 'grades');
+        $mform->addElement('date_time_selector', 'grade_item_hidden', get_string('hiddenuntil', 'grades'), array('optional'=>true));
+        $mform->disabledIf('hidden', 'grade_item_hidden[off]', 'notchecked');
 
         /// locking
         $mform->addElement('checkbox', 'grade_item_locked', get_string('locked', 'grades'));
@@ -411,8 +411,6 @@ function definition_after_data() {
             $grade_category = grade_category::fetch(array('id'=>$id));
             $grade_item = $grade_category->load_grade_item();
 
-            $mform->setDefault('grade_item_hidden', (int) $grade_item->hidden);
-
             if ($grade_item->is_outcome_item()) {
                 // we have to prevent incompatible modifications of outcomes if outcomes disabled
                 $mform->removeElement('grade_item_grademax');