From 01fd426bfa91cae2426edeea9c2c538ab19d0d6c Mon Sep 17 00:00:00 2001 From: Sam Hemelryk Date: Wed, 8 Oct 2014 10:37:42 +1300 Subject: [PATCH] Revert "MDL-46978 gradebook: Edit grade item changes visibility of category" This reverts commit f9f37ec8f4c866527d11099e46716095b111f7dc. --- lib/grade/grade_category.php | 7 +++++-- lib/grade/grade_item.php | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/lib/grade/grade_category.php b/lib/grade/grade_category.php index 7aeb5130204..453294c183e 100644 --- a/lib/grade/grade_category.php +++ b/lib/grade/grade_category.php @@ -1691,11 +1691,14 @@ class grade_category extends grade_object { } //if marking category visible make sure parent category is visible MDL-21367 - if ($this->is_hidden() != $hidden) { + if( !$hidden ) { $category_array = grade_category::fetch_all(array('id'=>$this->parent)); if ($category_array && array_key_exists($this->parent, $category_array)) { $category = $category_array[$this->parent]; - $category->set_hidden($hidden, false); + //call set_hidden on the category regardless of whether it is hidden as its parent might be hidden + //if($category->is_hidden()) { + $category->set_hidden($hidden, false); + //} } } } diff --git a/lib/grade/grade_item.php b/lib/grade/grade_item.php index 29138f7d62a..13744920a24 100644 --- a/lib/grade/grade_item.php +++ b/lib/grade/grade_item.php @@ -594,11 +594,14 @@ class grade_item extends grade_object { } //if marking item visible make sure category is visible MDL-21367 - if ($this->is_hidden() != $hidden) { + if( !$hidden ) { $category_array = grade_category::fetch_all(array('id'=>$this->categoryid)); if ($category_array && array_key_exists($this->categoryid, $category_array)) { $category = $category_array[$this->categoryid]; - $category->set_hidden($hidden, false); + //call set_hidden on the category regardless of whether it is hidden as its parent might be hidden + //if($category->is_hidden()) { + $category->set_hidden($hidden, false); + //} } } }