CDPP / AMDA_IHM

Commit 57bf884182c9ca67b2d8e0b45f66d6e3f8b67b37

Authored by Elena.Budnik
1 parent a8512cd5
Exists in master and in 111 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, livraison-akka, 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

correct mydataParam in IHM

Showing 3 changed files with 18 additions and 25 deletions   Show diff stats
Inline Side-by-side
js/app/models/InteractiveNode.js
  Diff comments   View file @57bf884
... ... @@ -166,18 +166,7 @@ Ext.define('amdaModel.InteractiveNode', {
166 166 isValidName : function(name, callBackFn)
167 167 {
168 168 var dataToSend = {name: name, nodeType: this.get('nodeType'), leaf: this.isLeaf()};
169   - AmdaAction.validNameObject(dataToSend, callBackFn);
170   -
171   - /*if (name.match(/[a-z,0-9]/gi)) {
172   - var subTreeRoot = this.getRootNode();
173   - //TODO - check to be sure that preload is already applied before to use the isValidName function (normally, this is the case)
174   - var nodeWithSameName = subTreeRoot.findChild('text', name, true);
175   - if (nodeWithSameName !== null && this !== nodeWithSameName) {
176   - return "This name already exists in this subtree!<br/>Do you want to overwrite it?";
177   - } else return true;
178   - } else {
179   - return "Name is required";
180   - }*/
  169 + AmdaAction.validNameObject(dataToSend, callBackFn);
181 170 },
182 171  
183 172 /**
... ...
js/app/models/MyDataParamNode.js
  Diff comments   View file @57bf884
... ... @@ -40,7 +40,8 @@ Ext.define(&#39;amdaModel.MyDataParamNode&#39;, {
40 40 if (this.get('isSpectra')) this.set('iconCls', 'icon-spectra');
41 41 },
42 42  
43   - localMenuItems : function() {
  43 + localMenuItems : function()
  44 + {
44 45 var menuItems =
45 46 [{
46 47 fnId : 'root-upload',
... ... @@ -74,12 +75,16 @@ Ext.define(&#39;amdaModel.MyDataParamNode&#39;, {
74 75 return menuItems;
75 76 },
76 77  
77   - getAllContextMenuItems: function(){
78   - return this.localMenuItems();
79   - },
  78 + getAllContextMenuItems: function()
  79 + {
  80 + var menuItems = this.allMenuItems('Parameter');
  81 + var locMenuItems = this.localMenuItems();
80 82  
81   - onMenuItemClick : function(menu,item,event) {
  83 + return Ext.Array.merge(menuItems,locMenuItems);
  84 + },
82 85  
  86 + onMenuItemClick : function(menu,item,event)
  87 + {
83 88 var fnId = Ext.util.Format.substr(item.fnId, 5, item.fnId.length);
84 89  
85 90 switch (fnId) {
... ...
php/classes/AmdaAction.php
  Diff comments   View file @57bf884
... ... @@ -141,8 +141,7 @@ class AmdaAction {
141 141  
142 142 $specialNode = false;
143 143 $isParameter = false;
144   - $skip = false;
145   - $isAddable = false;
  144 + $isAddable = false;
146 145 $isSimulation = false;
147 146 $rank = null;
148 147  
... ... @@ -464,15 +463,15 @@ class AmdaAction {
464 463 $obsolete = false;
465 464  
466 465 $disable = $restricted || $nonavailable || $obsolete;
467   - $childrenToReturn[] = array('text' => $name, 'id' => $id,'nodeType' => $nodeType, 'isAddable' => $isAddable,
468   - 'info' => $info, 'leaf' => false, 'isRemoteDataSet' => $isRemoteDataSet, 'disable' => $disable,
  466 +
  467 + $childrenToReturn[] = array('text' => $name, 'id' => $id,'nodeType' => $nodeType, 'isAddable' => $isAddable,
  468 + 'info' => $info, 'leaf' => false, 'isRemoteDataSet' => $isRemoteDataSet, 'disable' => $disable,
469 469 'isSimulation' => $isSimulation, 'rank' => $rank, 'isDeletable' => $isDeletable, 'help' => $help);
470 470 }
471 471  
472 472 break;
473 473 case 'myData' :
474   - $info = $child->hasAttribute('info') ? $child->getAttribute('info') : $child->nodeValue;
475   - // $info = str_replace("\n","<br/>",$info);
  474 + $info = $child->hasAttribute('info') ? $child->getAttribute('info') : $child->nodeValue;
476 475 break;
477 476  
478 477 case 'myDataParam' :
... ... @@ -493,8 +492,8 @@ class AmdaAction {
493 492 }
494 493  
495 494 if ($child->hasAttribute('desc')) {
496   - $globalStart = substr(str_replace('-','/',$child->getAttribute('desc')), 0, 16);
497   - $globalStop = substr(str_replace( '-','/',$child->getAttribute('desc')), 17, 22);
  495 + $globalStart = substr($child->getAttribute('desc'), 0, 19);
  496 + $globalStop = substr($child->getAttribute('desc'), 20);
498 497 }
499 498  
500 499 $childrenToReturn[] = array('text' => $name, 'size' => $size, 'id' => $id,
... ...