diff --git a/js/app/controllers/PlotModule.js b/js/app/controllers/PlotModule.js index 54a9d9e..074b9ca 100644 --- a/js/app/controllers/PlotModule.js +++ b/js/app/controllers/PlotModule.js @@ -208,12 +208,5 @@ Ext.define('amdaDesktop.PlotModule', { 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); - } } }); diff --git a/js/app/models/AmdaNode.js b/js/app/models/AmdaNode.js index 47d1ddf..8260c84 100644 --- a/js/app/models/AmdaNode.js +++ b/js/app/models/AmdaNode.js @@ -136,7 +136,12 @@ Ext.define('amdaModel.AmdaNode', { } } 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; diff --git a/js/app/models/PlotNode.js b/js/app/models/PlotNode.js index 7d0e71c..8fd26a8 100644 --- a/js/app/models/PlotNode.js +++ b/js/app/models/PlotNode.js @@ -27,7 +27,9 @@ Ext.define('amdaModel.PlotNode', { 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) { -- libgit2 0.21.2