CDPP / AMDA_IHM

Commit 42c574d922138dd0d0e4bc48788a456b277d89ea

Authored by Elena.Budnik
1 parent f2b3e0e8
Exists in master and in 99 other branches 10098, 10178, 5390, 6629, 6728, 6920, 7494, 7497, 7616, 8459, 8528, 8928, 9014, 9016Bis, 9017, 9049, 9084, 9259, 9326, 9345, 9505, 9660, 9750, 9750.bck, 9800, 9980, FER_10285, FER_10400, FER_10435, FER_10557, FER_10663, FER_10765, FER_10828, FER_10828_2, FER_10829, FER_10836, FER_10852, FER_10934, FER_11100, FER_11242, FER_11478, FER_11500, FER_11537, FER_11586, FER_11588, FER_5119, FER_5165, FER_6265, FER_6860, FER_6899, FER_6951, FER_7618, FER_7862, FER_8455, FER_9629, FER_9660, FER_9915, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, MAZ_10936, MAZ_11362, MAZ_11427, MAZ_6018, MAZ_9016_New, MAZ_FIX_9016, New_ColorMaps, SpeasyGet, amdadev, amdadev_test, anr_tempete, catalog-histo, create-user, cu2022, density_maps, develop, epn-tap, expression-parser-bre, frames-transformation, hapi, homePage, master_vge, mlplasmas, multiplot, new-save-plot-request, openam, plot-request, remoteData, rm_5776, rm_6912, rm_6912_bis, rm_7926, rm_8932, save-other-requests, special-params, test-merge, ws_get_catalog

rm 5959; alias excluded

Showing 6 changed files with 30 additions and 31 deletions   Show diff stats
Inline Side-by-side
generic_data/resources.json
  Diff comments   View file @42c574d
... ... @@ -7,7 +7,6 @@
7 7 ]
8 8 },
9 9 {"nodeType" : "derivedParam","text" : "Derived Parameters","id" : "derivedParam-treeRootNode"},
10   - {"nodeType" : "alias","text" : "Aliases","id" : "alias-treeRootNode"},
11 10 {"nodeType" : "", "text" : "Time Tables", "id" : "TT-treeBase" ,
12 11 "children" : [
13 12 { "nodeType" : "timeTable", "text" : "My Time Tables", "id" : "timeTable-treeRootNode"},
... ...
js/app/models/LocalParamNode.js
  Diff comments   View file @42c574d
... ... @@ -98,11 +98,11 @@ Ext.define('amdaModel.LocalParamNode',
98 98 fnId : 'para-createDerivedParam',
99 99 text : 'Create Derived Parameter',
100 100 hidden : true
101   - }, {
  101 + }, /*{
102 102 fnId : 'leaf-createAlias',
103 103 text : 'Create/Edit Alias',
104 104 hidden : true
105   - },{
  105 + },*/{
106 106 fnId : 'leaf-createDerivedParam',
107 107 text : 'Create Derived Parameter',
108 108 hidden : true
... ...
js/app/models/RemoteParamNode.js
  Diff comments   View file @42c574d
... ... @@ -55,10 +55,10 @@ Ext.define('amdaModel.RemoteParamNode', {
55 55 fnId : 'para-downParam',
56 56 text : 'Download Parameter',
57 57 hidden : true
58   - },{
  58 + },/*{
59 59 fnId : 'leaf-createAlias',
60 60 text : 'Create/Edit Alias'
61   - }, {
  61 + }, */{
62 62 fnId : 'leaf-createDerivedParam',
63 63 text : 'Create Derived Parameter'
64 64 },{
... ...
js/app/models/RemoteSimuParamNode.js
  Diff comments   View file @42c574d
... ... @@ -61,10 +61,10 @@ Ext.define('amdaModel.RemoteSimuParamNode', {
61 61 fnId : 'dire-collapseAll',
62 62 text : 'Close All'
63 63 },
64   - {
65   - fnId : 'leaf-createAlias',
66   - text : 'Create/Edit Alias'
67   - },
  64 +// {
  65 +// fnId : 'leaf-createAlias',
  66 +// text : 'Create/Edit Alias'
  67 +// },
68 68 {
69 69 fnId : 'leaf-createDerivedParam',
70 70 text : 'Create Derived Parameter'
... ...
js/app/views/ExplorerUI.js
  Diff comments   View file @42c574d
... ... @@ -945,10 +945,10 @@ Ext.define('amdaUI.ExplorerUI', {
945 945 tree.applyDisableToNode(localNode);
946 946  
947 947 //apply filter to aliases
948   - var aliasNode = tree.getRootNode().findChild('id','alias-treeRootNode',true);
949   - tree.applyFilterToNodes(aliasNode);
950   - tree.setNodesVisibility(aliasNode,false);
951   - tree.applyDisableToNode(aliasNode);
  948 +// var aliasNode = tree.getRootNode().findChild('id','alias-treeRootNode',true);
  949 +// tree.applyFilterToNodes(aliasNode);
  950 +// tree.setNodesVisibility(aliasNode,false);
  951 +// tree.applyDisableToNode(aliasNode);
952 952 break;
953 953  
954 954 case 'simu' :
... ...
php/classes/AmdaAction.php
  Diff comments   View file @42c574d
... ... @@ -200,24 +200,24 @@ class AmdaAction
200 200 $plotTabs = FALSE;
201 201 break;
202 202  
203   - case 'alias':
204   - $info = $id;
205   - $id = 'alias_'.$id;
206   - $component_info = array();
207   - if ($child->hasAttribute("index1"))
208   - $component_info["index1"] = $child->getAttribute('index1');
209   - if ($child->hasAttribute("index2"))
210   - $component_info["index2"] = $child->getAttribute('index2');
211   -
212   - if ($child->hasAttribute("parentId"))
213   - $component_info["parentId"] = $child->getAttribute("parentId");
214   -
215   - if ($child->hasAttribute("iconCls"))
216   - $iconCls = $child->getAttribute("iconCls");
217   -
218   - if ($isLeaf) $isParameter = true;
219   -
220   - break;
  203 +// case 'alias':
  204 +// $info = $id;
  205 +// $id = 'alias_'.$id;
  206 +// $component_info = array();
  207 +// if ($child->hasAttribute("index1"))
  208 +// $component_info["index1"] = $child->getAttribute('index1');
  209 +// if ($child->hasAttribute("index2"))
  210 +// $component_info["index2"] = $child->getAttribute('index2');
  211 +//
  212 +// if ($child->hasAttribute("parentId"))
  213 +// $component_info["parentId"] = $child->getAttribute("parentId");
  214 +//
  215 +// if ($child->hasAttribute("iconCls"))
  216 +// $iconCls = $child->getAttribute("iconCls");
  217 +//
  218 +// if ($isLeaf) $isParameter = true;
  219 +//
  220 +// break;
221 221  
222 222 case 'timeTable':
223 223 case 'catalog':
... ...