CDPP / AMDA_IHM

Commit 4f1c058ab9f2ff49380ef385d03a2c42a1023444

Authored by Benjamin Renard
1 parent 0cefcae2
Exists in master and in 106 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, special-params, sum-components-indexes, test-merge, ws_get_catalog

rm derived params ok

Showing 2 changed files with 2 additions and 4 deletions   Show diff stats
Inline Side-by-side
js/app/models/AmdaNode.js
  Diff comments   View file @4f1c058
... ... @@ -85,7 +85,6 @@ Ext.define('amdaModel.AmdaNode', {
85 85 */
86 86 getFilteredContextMenu : function(itemKind) {
87 87 var menuitems = this.getAllContextMenuItems();
88   -
89 88 var realmenuitems = 0;
90 89 if (menuitems && menuitems.length){
91 90 for ( var i = 0; i < menuitems.length; i++) {
... ... @@ -128,10 +127,10 @@ Ext.define(&#39;amdaModel.AmdaNode&#39;, {
128 127 itemKind = amdaUI.ExplorerUI.ITEM_KIND_ROOT;
129 128 }
130 129 // if this node is a leaf and have no child
131   - else if (this.isLeaf()) {
  130 + else if (this.isLeaf() || this.get('nodeType' ) == 'derivedParam' ) {
132 131 itemKind = amdaUI.ExplorerUI.ITEM_KIND_LEAF;
133 132 }
134   - else if (this.get('isParameter')) {
  133 + else if (this.get('isParameter') && this.get('nodeType' ) != 'derivedParam' ) {
135 134 itemKind = amdaUI.ExplorerUI.ITEM_KIND_PARA;
136 135 }
137 136 else if (this.get('rank')) {
... ...
js/app/views/DownloadUI.js
  Diff comments   View file @4f1c058
... ... @@ -494,7 +494,6 @@ Ext.define(&#39;amdaUI.DownloadUI&#39;, {
494 494 } else
495 495 {
496 496 idToSent = "ws_" + data.records[0].get('text');
497   - console.log(data.records[0]);
498 497 }
499 498 break;
500 499 case 'myDataParam' :
... ...