L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-46978' of https://github.com/danielneis/moodle

Browse Source
This commit is contained in:
Sam Hemelryk
2014-10-07 10:26:05 +13:00
parent 15b57a34df bad2c9b14f
commit f46606936a
2 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/grade/grade_category.php
+2 -5
View File
@@ -2249,14 +2249,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);
}
}
}
lib/grade/grade_item.php
+2 -5
View File
@@ -608,14 +608,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);
}
}
}