From 42c574d922138dd0d0e4bc48788a456b277d89ea Mon Sep 17 00:00:00 2001
From: Elena.Budnik <ebudnik@irap.omp.eu>
Date: Mon, 30 Sep 2019 10:56:50 +0200
Subject: [PATCH] rm 5959; alias excluded

---
 generic_data/resources.json          |  1 -
 js/app/models/LocalParamNode.js      |  4 ++--
 js/app/models/RemoteParamNode.js     |  4 ++--
 js/app/models/RemoteSimuParamNode.js |  8 ++++----
 js/app/views/ExplorerUI.js           |  8 ++++----
 php/classes/AmdaAction.php           | 36 ++++++++++++++++++------------------
 6 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/generic_data/resources.json b/generic_data/resources.json
index 524a60c..67f560a 100644
--- a/generic_data/resources.json
+++ b/generic_data/resources.json
@@ -7,7 +7,6 @@
 		]
   },
   {"nodeType" : "derivedParam","text" : "Derived Parameters","id" : "derivedParam-treeRootNode"},
-  {"nodeType" : "alias","text" : "Aliases","id" : "alias-treeRootNode"},   
   {"nodeType" : "", "text" : "Time Tables", "id" :  "TT-treeBase" , 
   "children" : [
 		 { "nodeType" : "timeTable", "text" : "My Time Tables", "id" : "timeTable-treeRootNode"},
diff --git a/js/app/models/LocalParamNode.js b/js/app/models/LocalParamNode.js
index e54f225..375764b 100644
--- a/js/app/models/LocalParamNode.js
+++ b/js/app/models/LocalParamNode.js
@@ -98,11 +98,11 @@ Ext.define('amdaModel.LocalParamNode',
 			fnId : 'para-createDerivedParam',
 			text : 'Create Derived Parameter',
 			hidden : true
-		}, {
+		}, /*{
 			fnId : 'leaf-createAlias',
 			text : 'Create/Edit Alias',
 			hidden : true
-		},{
+		},*/{
 			fnId : 'leaf-createDerivedParam',
 			text : 'Create Derived Parameter',
 			hidden : true
diff --git a/js/app/models/RemoteParamNode.js b/js/app/models/RemoteParamNode.js
index bc61c4a..17db2d9 100644
--- a/js/app/models/RemoteParamNode.js
+++ b/js/app/models/RemoteParamNode.js
@@ -55,10 +55,10 @@ Ext.define('amdaModel.RemoteParamNode', {
 		fnId : 'para-downParam',
 			text : 'Download Parameter',
 			hidden : true
-		},{
+		},/*{
 			fnId : 'leaf-createAlias',
 			text : 'Create/Edit Alias'
-		}, {
+		}, */{
 			fnId : 'leaf-createDerivedParam',
 			text : 'Create Derived Parameter'
 		},{
diff --git a/js/app/models/RemoteSimuParamNode.js b/js/app/models/RemoteSimuParamNode.js
index 78d835c..ba0d730 100644
--- a/js/app/models/RemoteSimuParamNode.js
+++ b/js/app/models/RemoteSimuParamNode.js
@@ -61,10 +61,10 @@ Ext.define('amdaModel.RemoteSimuParamNode', {
 				fnId : 'dire-collapseAll',
 				text : 'Close All'
 			},
-			{
-				fnId : 'leaf-createAlias',
-				text : 'Create/Edit Alias'
-			}, 
+// 			{
+// 				fnId : 'leaf-createAlias',
+// 				text : 'Create/Edit Alias'
+// 			}, 
 			{    
 				fnId : 'leaf-createDerivedParam',
 				text : 'Create Derived Parameter'
diff --git a/js/app/views/ExplorerUI.js b/js/app/views/ExplorerUI.js
index cbd8346..6325626 100644
--- a/js/app/views/ExplorerUI.js
+++ b/js/app/views/ExplorerUI.js
@@ -945,10 +945,10 @@ Ext.define('amdaUI.ExplorerUI', {
 								tree.applyDisableToNode(localNode);
 
 								//apply filter to aliases
-								var aliasNode = tree.getRootNode().findChild('id','alias-treeRootNode',true);
-								tree.applyFilterToNodes(aliasNode);
-								tree.setNodesVisibility(aliasNode,false);
-								tree.applyDisableToNode(aliasNode);
+// 								var aliasNode = tree.getRootNode().findChild('id','alias-treeRootNode',true);
+// 								tree.applyFilterToNodes(aliasNode);
+// 								tree.setNodesVisibility(aliasNode,false);
+// 								tree.applyDisableToNode(aliasNode);
 								break;
 
 						case 'simu' :
diff --git a/php/classes/AmdaAction.php b/php/classes/AmdaAction.php
index a4bc798..2b13e7b 100644
--- a/php/classes/AmdaAction.php
+++ b/php/classes/AmdaAction.php
@@ -200,24 +200,24 @@ class AmdaAction
 							$plotTabs = FALSE;
 						break;
 
-						case 'alias':
-							$info = $id;
-							$id = 'alias_'.$id;
-							$component_info = array();
-							if ($child->hasAttribute("index1"))
-								$component_info["index1"] = $child->getAttribute('index1');
-							if ($child->hasAttribute("index2"))
-								$component_info["index2"] = $child->getAttribute('index2');
-
-							if ($child->hasAttribute("parentId"))
-								$component_info["parentId"] = $child->getAttribute("parentId");
-
-							if ($child->hasAttribute("iconCls"))
-								$iconCls = $child->getAttribute("iconCls");
-
-							if ($isLeaf) $isParameter = true;
-
-						break;
+// 						case 'alias':
+// 							$info = $id;
+// 							$id = 'alias_'.$id;
+// 							$component_info = array();
+// 							if ($child->hasAttribute("index1"))
+// 								$component_info["index1"] = $child->getAttribute('index1');
+// 							if ($child->hasAttribute("index2"))
+// 								$component_info["index2"] = $child->getAttribute('index2');
+// 
+// 							if ($child->hasAttribute("parentId"))
+// 								$component_info["parentId"] = $child->getAttribute("parentId");
+// 
+// 							if ($child->hasAttribute("iconCls"))
+// 								$iconCls = $child->getAttribute("iconCls");
+// 
+// 							if ($isLeaf) $isParameter = true;
+// 
+// 						break;
 
 						case 'timeTable':
 						case 'catalog':
--
libgit2 0.21.2