Merge branch 'master' into amdadev

Benjamin Renard
2 parents 78bffaa7 65529d3e
Showing 2 changed files with 9 additions and 2 deletions Show diff stats
js/app/models/AmdaNode.js
php/classes/AmdaAction.php
@@ -21,7 +21,8 @@ Ext.define(&#39;amdaModel.AmdaNode&#39;, {
 		{name:'rootNode',  persist: false},
 		{name: 'ownerTreeId', persist: false},
 		{name: 'ownerTree',  persist: false},
-		{name: 'checked', defaultValue: null, persist: false}
+		{name: 'checked', defaultValue: null, persist: false},
+		{name: 'visible', type: 'boolean', defaultValue: true},
 	],
 	statics : {
@@ -362,6 +362,11 @@ class AmdaAction
 								}
 								$disable = TRUE;
+								$hideIfRestricted = FALSE;
+								if ($child->hasAttribute("hideIfRestricted") && ($child->getAttribute("hideIfRestricted") == "1")) {
+									$hideIfRestricted = TRUE;
+								}
+
 								if ($child->hasAttribute('group')) {
 									if ($child->getAttribute("group") === "TBD") {
 											$info .=  "<br/><b>Under Testing</b>";
@@ -382,9 +387,10 @@ class AmdaAction
 									if ($child->hasAttribute('restriction') && $child->getAttribute('restriction') == 'plotOnly')
 										$info .=  "<br/><b>Plot Only!!!</b>";
 								}
+								$visible = !($disable && $hideIfRestricted);
 								$childrenToReturn[] = array('text' => $name, 'id' => $id,'nodeType' => $nodeType,  'info' => $info, 'last_update' => $last_update,
-									'leaf' => false, 'help' => $help, 'disable' => $disable, 'rank' => $rank, 'timeRestriction' => $timeRestriction);
+									'leaf' => false, 'help' => $help, 'disable' => $disable, 'visible' => $visible, 'rank' => $rank, 'timeRestriction' => $timeRestriction);
 							}
 						break;