Fix bugs when creating and renaming folders

Nathanaël Jourdane · Elena Budnik
1 parent 36904910
Showing 2 changed files with 32 additions and 28 deletions Show diff stats
js/app/models/InteractiveNode.js
js/app/views/ExplorerUI.js
@@ -146,7 +146,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.parentNode.get('id'), 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.isLeaf(), nodeType: this.get('nodeType')};
 		AmdaAction.renameObject(dataToSend, callBackFn);		 
 	},
@@ -442,7 +442,7 @@ Ext.define(&#39;amdaModel.InteractiveNode&#39;, {
 				this.createLeaf(this);
 				break;                    
 			case 'renameNode':
-				this.renameNode(); 
+				this.renameNode(false);
 				break;
 			case 'editLeaf':   
 				this.editLeaf(); 
@@ -704,7 +704,8 @@ Ext.define(&#39;amdaModel.InteractiveNode&#39;, {
 				{
 					leaf : false, nodeType : me.get('nodeType'),
 					text : amdaModel.AmdaNode.NEW_DIR_NAME,
-					children : []
+					children : [],
+          parentId: me.get('id')
 				});
 				// insert the new node as a child of node
@@ -716,7 +717,7 @@ Ext.define(&#39;amdaModel.InteractiveNode&#39;, {
 				// select the new node
 				me.myGetOwnerTree().getSelectionModel().select(newNode);
 				// call the renameNode method for this new node
-				newNode.renameNode();
+				newNode.renameNode(true);
 			});
 	},
@@ -736,7 +737,7 @@ Ext.define(&#39;amdaModel.InteractiveNode&#39;, {
 			});
 	},
-	renameNode: function()
+	renameNode: function(deleteOnFailure)
 	{
 		if (this.myGetOwnerTree())
 		{			
@@ -746,8 +747,10 @@ Ext.define(&#39;amdaModel.InteractiveNode&#39;, {
 				function()
 				{
 					// fire the edition event on tree
-					me.myGetOwnerTree().fireEvent('edition',me.myGetOwnerTree().view, me.myGetOwnerTree().getSelectionModel().selected.items[0]);
-				});		
+					var item = me.myGetOwnerTree().getSelectionModel().selected.items[0];
+					item.deleteOnFailure = deleteOnFailure;
+					me.myGetOwnerTree().fireEvent('edition', me.myGetOwnerTree().view, item);
+				});
 		}
 		else
 		{
@@ -719,9 +719,7 @@ Ext.define(&#39;amdaUI.ExplorerUI&#39;, {
                             validFlag = 'Invalid object name';
 													}
 												}
-												if (validFlag === true) {
-                          field.lastValid = newValue;
-												} else {
+                        if (validFlag !== true) {
                         	field.markInvalid(validFlag);
 												}
                         field.validFlag = validFlag;
@@ -732,25 +730,28 @@ Ext.define(&#39;amdaUI.ExplorerUI&#39;, {
 							scope: this
 						}
 					}],
-					//add our custom editor plugin
-					plugins:  [ new MyTreeEditor({
-						pluginId: 'treeEditor',
-						listeners: {
-							'edit': function (editor, e) {
-								if(e.column.field.validFlag !== true) {
-                  if(e.column.field.lastValid) {
-                    e.record.data[e.field] = e.column.field.lastValid;
-                  } else {
-                    e.record.remove(true);
-                  }
+					// Add our custom editor plugin
+					plugins: [
+						new MyTreeEditor({
+							pluginId: 'treeEditor',
+							listeners: {
+								beforeedit: function (editor, e) {
+									e.column.field.fireEvent('change', e.column.field, e.value, '');
+								},
+								validateedit: function (editor, e) {
+									if (e.column.field.validFlag !== true) {
+										if (e.record.deleteOnFailure) {
+											e.record.remove(true);
+										} else {
+											return false;
+										}
+									}
+									return true;
 								}
-              },
-              'beforeedit': function (editor, e) {
-                e.column.field.fireEvent('change', e.column.field, e.value, '');
-              }
-						},
-						scope: this
-					})],
+							},
+							scope: this
+						})
+					],
 					setNodesVisibility : function(node,forceHide)
 					{