CDPP / AMDA_IHM

Commit d3f8a6d06df4553d544810a9d0b0d036bd64a0a3

Authored by Elena.Budnik
1 parent 92edb3d1
Exists in master and in 110 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, alias, amdadev, amdadev_test, anr_tempete, catalog-histo, create-user, cu2022, data-activities, density_maps, develop, epn-tap, expression-parser-bre, frames-transformation, hapi, homePage, install-rework, master_vge, minimize, mlplasmas, multiplot, new-save-plot-request, openam, plot-request, plot-request-update, plot-tt-catalog, remoteData, rm_5118, rm_5776, rm_6912, rm_6912_bis, rm_7926, rm_8932, save-other-requests, save-plot, save-plot-request, shared-objects-updater, special-params, sum-components-indexes, test-merge, ws_get_catalog

internal paramID

Showing 2 changed files with 13 additions and 7 deletions   Show diff stats
Inline Side-by-side
js/app/views/ParamsMgrUI.js
  Diff comments   View file @d3f8a6d
... ... @@ -155,7 +155,9 @@ Ext.define('amdaUI.ParamsMgrUI',{
155 155 var srcNode = record;
156 156 var id = srcNode.get('id');
157 157 // Check if node exists already at destination
158   - if (root.findChild('id',id, true)) {
  158 + var idToCheck = id.toLowerCase().replace(":", "_", "gi");
  159 + // TODO check at sever side
  160 + if (root.findChild('id',idToCheck, true)) {
159 161 myDesktopApp.infoMsg('This parameter exists already in your treee');
160 162 return;
161 163 }
... ... @@ -184,8 +186,8 @@ Ext.define('amdaUI.ParamsMgrUI',{
184 186 }
185 187 });
186 188  
187   - // Add new node to correct location
188   - parentNode.expand(!this.isDataSet, function(res){
  189 + // Add new node to correct location
  190 + parentNode.expand(!this.isDataSet, function(res){
189 191 var newNode = srcNode.copy();
190 192 parentNode.appendChild(newNode);
191 193 //to sync treeStore
... ... @@ -193,7 +195,7 @@ Ext.define('amdaUI.ParamsMgrUI',{
193 195 //expand the whole subtree of added node
194 196 tree.selectPath(newNode.getPath( 'id', '|'), 'id', '|');
195 197 });
196   - return true;
  198 + return true;
197 199 },
198 200  
199 201 onViewRender : function(view){
... ...
php/RemoteDataCenter/RemoteParamManager.php
  Diff comments   View file @d3f8a6d
... ... @@ -77,7 +77,7 @@ class RemoteParamManager
77 77 if (!$this->center->ViId) return false;
78 78 if (!$this->center->ParamId) return false;
79 79  
80   - $this->paramId = strtolower($this->center->baseID."_".$this->center->ViId."_".$this->center->ParamId);
  80 + // $this->paramId = strtolower($this->center->baseID."_".$this->center->ViId."_".$this->center->ParamId);
81 81  
82 82 $xmlNameRemote = RemoteData."/PARAMS/".$this->paramId.".xml";
83 83 $xmlNameTemp = PARAMS_LOCALDB_DIR."/".$this->paramId.".xml";
... ... @@ -126,7 +126,9 @@ class RemoteParamManager
126 126 protected function addNode($id)
127 127 {
128 128 // Node exists already
129   - if ($this->xmlDom->getElementById($id)) return true;
  129 + $this->paramId = strtr(strtolower($id),":","_");
  130 +
  131 + if ($this->xmlDom->getElementById($this->paramId)) return true;
130 132  
131 133 // Node to be added
132 134 $nodeRemote = $this->center->baseDom->getElementById($id);
... ... @@ -224,7 +226,8 @@ class RemoteParamManager
224 226  
225 227 if ($id == 'root') return array('res' => 'ok');
226 228  
227   - $this->setBaseId($id);
  229 + $this->setBaseId($id);
  230 +
228 231 $res = $this->addNode($id);
229 232  
230 233 if ($res === false) return array("err" => "Cannot add node : $id");
... ... @@ -238,6 +241,7 @@ class RemoteParamManager
238 241 if ($id == 'root') continue;
239 242  
240 243 if (!$this->baseId) $this->setBaseId($id);
  244 +
241 245 $res = $this->addNode($id);
242 246  
243 247 if ($res === false) return array("err" => "Cannot add node : $id");
... ...