From bad2c9b14f27e6d9a370ac6cff6b8b5c2dc79a17 Mon Sep 17 00:00:00 2001 From: Daniel Neis Araujo Date: Mon, 29 Sep 2014 16:03:01 -0300 Subject: [PATCH] MDL-46978 gradebook: Edit grade item changes visibility of category --- lib/grade/grade_category.php | 7 ++----- lib/grade/grade_item.php | 7 ++----- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/lib/grade/grade_category.php b/lib/grade/grade_category.php index 91cce7a3f4a..ca4ec1bae2e 100644 --- a/lib/grade/grade_category.php +++ b/lib/grade/grade_category.php @@ -1691,14 +1691,11 @@ class grade_category extends grade_object { } //if marking category visible make sure parent category is visible MDL-21367 - if( !$hidden ) { + if ($this->is_hidden() != $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]; - //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); - //} + $category->set_hidden($hidden, false); } } } diff --git a/lib/grade/grade_item.php b/lib/grade/grade_item.php index 3f8b273fd0e..35e78e6e565 100644 --- a/lib/grade/grade_item.php +++ b/lib/grade/grade_item.php @@ -594,14 +594,11 @@ class grade_item extends grade_object { } //if marking item visible make sure category is visible MDL-21367 - if( !$hidden ) { + if ($this->is_hidden() != $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]; - //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); - //} + $category->set_hidden($hidden, false); } } } -- 2.43.0