CDPP / AMDA_IHM

Commit f21cd402574447a79e93639afbc6d4ab2fc3b7b6

Authored by Benjamin Renard
1 parent 098d15a9
Exists in master and in 107 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, 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-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

Fix components selection in download UI (#6520)

Showing 2 changed files with 13 additions and 13 deletions   Show diff stats
Inline Side-by-side
js/app/models/InteractiveNode.js
  Diff comments   View file @f21cd40
... ... @@ -487,16 +487,16 @@ Ext.define('amdaModel.InteractiveNode', {
487 487 else
488 488 paramName = node.get('id');
489 489 }
490   -// var component_info = node.get('component_info');
491   -// if (component_info && component_info.parentId) {
492   -// //It's a component
493   -// paramName = component_info.parentId;
494   -// components = [];
495   -// if (component_info.index1)
496   -// components['index1'] = component_info.index1;
497   -// if (component_info.index2)
498   -// components['index2'] = component_info.index2;
499   -// }
  490 + var component_info = node.get('component_info');
  491 + if (component_info && component_info.parentId) {
  492 + //It's a component
  493 + paramName = component_info.parentId;
  494 + components = [];
  495 + if (component_info.index1)
  496 + components['index1'] = component_info.index1;
  497 + if (component_info.index2)
  498 + components['index2'] = component_info.index2;
  499 + }
500 500 module.addParam(paramName,true,node.get('needsArgs'),components);
501 501 });
502 502 },
... ...
js/app/views/DownloadUI.js
  Diff comments   View file @f21cd40
... ... @@ -121,8 +121,8 @@ Ext.define('amdaUI.DownloadUI', {
121 121 var pos = this.paramGrid.store.getCount();
122 122 this.paramGrid.store.insert(pos,r);
123 123 this.paramGrid.getView().refresh();
124   - if (!isLeaf || needArgs)
125   - this.editParameterArgs(r);
  124 + //if (!isLeaf || needArgs)
  125 + // this.editParameterArgs(r);
126 126 },
127 127  
128 128 addParams: function(arrayParams)
... ... @@ -455,7 +455,7 @@ Ext.define('amdaUI.DownloadUI', {
455 455 var component_info = data.records[0].get('component_info');
456 456 if (component_info && component_info.parentId)
457 457 {
458   - if ( component_info.index1 && component_info.index2 )
  458 + if ( component_info.index1 || component_info.index2 )
459 459 {
460 460 idToSent = component_info.parentId;
461 461 components = [];
... ...