CDPP / AMDA_IHM

Commit 941aea394cbf5e7d7bca330f2f64b74bacbce087

Authored by Elena.Budnik
2 parents 07650d8e 754a2160
Exists in master and in 109 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, akkodis/amdadev, alias, amdadev, amdadev_test, anr_tempete, catalog-histo, create-user, cu2022, density_maps, develop, epn-tap, expression-parser-bre, frames-transformation, hapi, homePage, 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

Merge branch 'master' into catalog-update-view

Showing 2 changed files with 8 additions and 20 deletions   Show diff stats
Inline Side-by-side
js/app/controllers/AboutModule.js
  Diff comments   View file @941aea3
... ... @@ -46,7 +46,7 @@ Ext.define('amdaDesktop.AboutModule',
46 46 constrainHeader:true
47 47 });
48 48  
49   - if (specialInfo) {
  49 + if (specialInfo && this.file != 'about') {
50 50 win.add({ xtype: 'toolbar',
51 51 items: [ {
52 52 text: 'AMDA\'s ABCs',
... ...
js/app/models/LocalParamNode.js
  Diff comments   View file @941aea3
... ... @@ -189,31 +189,19 @@ Ext.define('amdaModel.LocalParamNode',
189 189  
190 190 createLeaf: function(node)
191 191 {
192   - // instanciate a Parameter object with the current data in his buidchain
193   - var param = Ext.create(this.get('objectDataModel'));//, { buildchain: node.get('alias') ? "#"+node.get('alias') : node.get('id') });
194   - // instanciate a DerivedParamNode with this param object
195   - var newNode = Ext.create(amdaModel.DerivedParamNode.$className, {leaf : true, object : param});
196   -
197   - // edit newNode into Parameter Module with node as contextNode
198   - newNode.editInModule();
199   -
200   - var module = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.param.id, true, function(module) {
  192 + myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.param.id, true, function(module) {
  193 + if (!myDesktopApp.desktop.getWindow(myDesktopApp.dynamicModules.param.id)) {
  194 + var param = Ext.create(node.get('objectDataModel'));
  195 + var newNode = Ext.create(amdaModel.DerivedParamNode.$className, {leaf : true, object : param});
  196 + // edit newNode into Parameter Module with node as contextNode
  197 + newNode.editInModule();
  198 + }
201 199 var paramName;
202 200 var components = null;
203 201 if (node.get('alias')!= "" )
204 202 paramName = "#"+node.get('alias');
205 203 else
206 204 paramName = node.get('id');
207   -// var component_info = node.get('component_info');
208   -// if (component_info && component_info.parentId) {
209   -// //It's a component
210   -// paramName = component_info.parentId;
211   -// components = [];
212   -// if (component_info.index1)
213   -// components['index1'] = component_info.index1;
214   -// if (component_info.index2)
215   -// components['index2'] = component_info.index2;
216   -// }
217 205  
218 206 module.addParam(paramName,true,node.get('needsArgs'),components);
219 207 });
... ...