Commit 4f1c058ab9f2ff49380ef385d03a2c42a1023444

Authored by Benjamin Renard
1 parent 0cefcae2

rm derived params ok

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