CDPP / AMDA_IHM

Commit a8c008f191ca739a557c7b1ba821100b0848e7b4

Authored by Benjamin Renard
1 parent fbadedf4
Exists in master and in 103 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, 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, remoteData, rm_5118, rm_5776, rm_6912, rm_6912_bis, rm_7926, rm_8932, save-other-requests, save-plot-request, special-params, test-merge, ws_get_catalog

Fix contextual menu

Showing 3 changed files with 9 additions and 9 deletions   Show diff stats
Inline Side-by-side
js/app/controllers/PlotModule.js
  Diff comments   View file @a8c008f
... ... @@ -208,12 +208,5 @@ Ext.define('amdaDesktop.PlotModule', {
208 208 getWindowResult: function(winResultId){
209 209 if (!this.plotResultWindowsManager.get(winResultId)) return null;
210 210 return this.plotResultWindowsManager.get(winResultId);
211   - },
212   -
213   - forceTabSelection: function(tabId) {
214   - var uiContent = this.getUiContent();
215   - if (uiContent != null) {
216   - uiContent.forceActiveTab(tabId);
217   - }
218 211 }
219 212 });
... ...
js/app/models/AmdaNode.js
  Diff comments   View file @a8c008f
... ... @@ -136,7 +136,12 @@ Ext.define('amdaModel.AmdaNode', {
136 136 }
137 137 }
138 138 else if (this.get('nodeType') == 'request') {
139   - itemKind = amdaUI.ExplorerUI.ITEM_KIND_LEAF;
  139 + if (this.get('tabs') && (this.get('tabs').length > 0)) {
  140 + itemKind = amdaUI.ExplorerUI.ITEM_KIND_LEAF;
  141 + }
  142 + else {
  143 + itemKind = amdaUI.ExplorerUI.ITEM_KIND_DIRE;
  144 + }
140 145 }
141 146 else if (this.get('isParameter') && this.get('nodeType' ) != 'derivedParam' ) {
142 147 itemKind = amdaUI.ExplorerUI.ITEM_KIND_PARA;
... ...
js/app/models/PlotNode.js
  Diff comments   View file @a8c008f
... ... @@ -27,7 +27,9 @@ Ext.define('amdaModel.PlotNode', {
27 27 this.set('moduleId',myDesktopApp.dynamicModules.plot.id);
28 28 this.set('objectDataModel','amdaPlotObj.PlotRequestObject');
29 29 this.set('nodeType',this.self.nodeType);
30   - this.updateTabs(this.get('tabs'));
  30 + if (this.get('leaf')) {
  31 + this.updateTabs(this.get('tabs'));
  32 + }
31 33 },
32 34  
33 35 updateTabs : function(tabs) {
... ...