Fix contextual menu

Benjamin Renard
1 parent fbadedf4
Showing 3 changed files with 9 additions and 9 deletions Show diff stats
js/app/controllers/PlotModule.js
js/app/models/AmdaNode.js
js/app/models/PlotNode.js
@@ -208,12 +208,5 @@ Ext.define(&#39;amdaDesktop.PlotModule&#39;, {
     getWindowResult: function(winResultId){
 	    if (!this.plotResultWindowsManager.get(winResultId)) return null;
 	    return this.plotResultWindowsManager.get(winResultId);	    
-	},
-
-    forceTabSelection: function(tabId) {
-	var uiContent = this.getUiContent();
-        if (uiContent != null) {
-		uiContent.forceActiveTab(tabId);
-	}
     }
 });
@@ -136,7 +136,12 @@ Ext.define(&#39;amdaModel.AmdaNode&#39;, {
 			}
 		}
 		else if (this.get('nodeType')  ==  'request') {
-			itemKind = amdaUI.ExplorerUI.ITEM_KIND_LEAF;
+			if (this.get('tabs') && (this.get('tabs').length > 0)) {
+				itemKind = amdaUI.ExplorerUI.ITEM_KIND_LEAF;
+			}
+			else {
+				itemKind = amdaUI.ExplorerUI.ITEM_KIND_DIRE;
+			}
 		}
 		else if (this.get('isParameter') &&  this.get('nodeType' ) !=  'derivedParam' ) {
 					itemKind = amdaUI.ExplorerUI.ITEM_KIND_PARA;
@@ -27,7 +27,9 @@ Ext.define(&#39;amdaModel.PlotNode&#39;, {
         this.set('moduleId',myDesktopApp.dynamicModules.plot.id);
         this.set('objectDataModel','amdaPlotObj.PlotRequestObject');
         this.set('nodeType',this.self.nodeType);
-	this.updateTabs(this.get('tabs'));
+	if (this.get('leaf')) {
+		this.updateTabs(this.get('tabs'));
+	}
     },
     updateTabs : function(tabs) {