Fix plot request deletion

Benjamin Renard
1 parent 3a420953
Showing 2 changed files with 16 additions and 17 deletions Show diff stats
js/app/models/InteractiveNode.js
js/app/models/PlotNode.js
@@ -52,7 +52,7 @@ Ext.define(&#39;amdaModel.InteractiveNode&#39;, {
 			{
 				node.eachChild(function(n)
 					{		      
-						if (!n.isLoaded() && !n.isLeaf())
+						if (!n.isLoaded() && !n.isRealLeaf())
 						{
 							nodesToLoad.push(n);
 							me.preloadTreeNode(n,nodesToLoad,onloaded);
@@ -70,7 +70,7 @@ Ext.define(&#39;amdaModel.InteractiveNode&#39;, {
 					{
 						records.forEach(function (record)
 							{                                                       
-								if (!record.isLoaded() && !record.isLeaf())
+								if (!record.isLoaded() && !record.isRealLeaf())
 									{
 										nodesToLoad.push(record);
 										me.preloadTreeNode(record,nodesToLoad,onloaded);
@@ -99,6 +99,11 @@ Ext.define(&#39;amdaModel.InteractiveNode&#39;, {
 			}  
 		}
 	},
+
+	isRealLeaf: function()
+	{
+		return this.isLeaf();
+	},
 /**
 * this method is overriden into ExecutableNode to return true
@@ -146,7 +151,7 @@ Ext.define(&#39;amdaModel.InteractiveNode&#39;, {
 */
 	rename: function(value,callBackFn) 
 	{ 		 
-		var dataToSend = {id : this.get('id'), old_name: this.modified.text, name: value,  parent : this.data.parentId, leaf: this.isLeaf(), nodeType: this.get('nodeType')};
+		var dataToSend = {id : this.get('id'), old_name: this.modified.text, name: value,  parent : this.data.parentId, leaf: this.isRealLeaf(), nodeType: this.get('nodeType')};
 		AmdaAction.renameObject(dataToSend, callBackFn);		 
 	},
@@ -155,7 +160,7 @@ Ext.define(&#39;amdaModel.InteractiveNode&#39;, {
 */
 	renameDD: function(parentId, callBackFn) 
 	{ 
-		var dataToSend = {id : this.get('id'), old_name: this.get('name'), name: this.get('name'), parent : parentId, leaf: this.isLeaf(), nodeType: this.get('nodeType')};
+		var dataToSend = {id : this.get('id'), old_name: this.get('name'), name: this.get('name'), parent : parentId, leaf: this.isRealLeaf(), nodeType: this.get('nodeType')};
 		AmdaAction.renameObject(dataToSend, callBackFn);
 	},
@@ -166,7 +171,7 @@ Ext.define(&#39;amdaModel.InteractiveNode&#39;, {
 */
 	isValidName : function(name, callBackFn)
 	{
-		var dataToSend = {name: name, nodeType: this.get('nodeType'), leaf: this.isLeaf()};
+		var dataToSend = {name: name, nodeType: this.get('nodeType'), leaf: this.isRealLeaf()};
 		AmdaAction.validNameObject(dataToSend, callBackFn);
 	},
@@ -515,7 +520,7 @@ Ext.define(&#39;amdaModel.InteractiveNode&#39;, {
 	deleteNode: function() {		   
 			// if the target is a directory
-			if (!this.isLeaf()) {
+			if (!this.isRealLeaf()) {
 				// determine if this directory is empty before launching the delete confirmation method
 				this.isNotEmptyDir(this.confirmDirectoryDeletion);                        
 			// else (the target is a leaf)
@@ -568,14 +573,14 @@ Ext.define(&#39;amdaModel.InteractiveNode&#39;, {
 */
 	realDelete : function()
 	{                       
-		AmdaAction.deleteObject({id: this.get('id'), leaf: this.isLeaf(), nodeType: this.get('nodeType')}, function(res,e){ 
+		AmdaAction.deleteObject({id: this.get('id'), leaf: this.isRealLeaf(), nodeType: this.get('nodeType')}, function(res,e){ 
 			//TODO proper errors handling                       
 			// node deletion in tree 
 			if (res) {  // if success
 				if (res.id) {
 					//Ext.Msg.show({title:'Warning', msg: 'Requests with parameter '+node.data.text+' are deleted', icon: Ext.MessageBox.ERROR, buttons: Ext.Msg.OK});
 					if (this.parentNode) {
-						if (this.isLeaf()){
+						if (this.isRealLeaf()){
 							var moduleId = this.get('moduleId');
 							// if really interactive node 
 							if (moduleId) {
@@ -135,16 +135,10 @@ Ext.define(&#39;amdaModel.PlotNode&#39;, {
         }
     },
-    rename: function(value,callBackFn) {
+    isRealLeaf: function()
+    {
 	var isFolder = (!this.isLeaf()) && (this.get('tabs') === false);
-	var dataToSend = {id : this.get('id'), old_name: this.modified.text, name: value,  parent : this.data.parentId, leaf: !isFolder, nodeType: this.get('nodeType')};
-	AmdaAction.renameObject(dataToSend, callBackFn);
-    },
-
-    renameDD: function(parentId, callBackFn) {
-	var isFolder = (!this.isLeaf()) && (this.get('tabs') === false);
-	var dataToSend = {id : this.get('id'), old_name: this.get('name'), name: this.get('name'), parent : parentId, leaf: !isFolder, nodeType: this.get('nodeType')};
-        AmdaAction.renameObject(dataToSend, callBackFn);
+        return !isFolder;
     },
     insertPlotTabsRequest: function() {