Merge branch 'rm_6522' into 'master'

Rm 6522 See merge request !36

Merge branch 'rm_6522' into 'master'
Rm 6522 See merge request !36
Elena Budnik
2 parents d23bf7c6 f6206fd6
Showing 1 changed file with 44 additions and 39 deletions Show diff stats
js/app/models/InteractiveNode.js
@@ -28,8 +28,7 @@ Ext.define(&#39;amdaModel.InteractiveNode&#39;, {
 	statics: {
 		preloadNodes : function(node,onready)
 		{
-			var me = this;
-			
+			var me = this;	
 			var nodesToLoad = new Array();
 			nodesToLoad.push(node);
 			this.preloadTreeNode(node, nodesToLoad, function (node)
@@ -131,7 +130,7 @@ Ext.define(&#39;amdaModel.InteractiveNode&#39;, {
 				}       	 
 				module.setContextNode(contextNode); 
  
-			} else if (module.getLinkedNode() != null){	
+			} else if (module.getLinkedNode() != null){
 			//TODO the node to edit is already edited
 				// myDesktopApp.warningMsg('This object is  being edited');
 				//Sol1: msg alert: "warning this node is already edited! If you want to get the original, please press the 'reset' button"->'OK'
@@ -237,7 +236,7 @@ Ext.define(&#39;amdaModel.InteractiveNode&#39;, {
 		if (!this.get('contextNode') || (this.get('contextNode').data.id == 'sharedtimeTable-treeRootNode') || (this.get('contextNode').data.id == 'sharedcatalog-treeRootNode')) {
 			// set the root node of 'Derived Parameters' tree as contextNode
 			this.set('contextNode',this.getRootNode());
-		}        
+		} 
 		// call the Ext.Direct method to create parameter 
 		AmdaAction.createObject(this.get('object').getJsonValues(false), this.get('contextNode').get('id'), function(res,e){          
 			//success
@@ -258,12 +257,13 @@ Ext.define(&#39;amdaModel.InteractiveNode&#39;, {
 					} 
 					// set text of this node
 					this.set('text',this.get('object').get('name'));
+
 					//set id of this node
 					this.set('id',res.id);
 					this.internalId = res.id;
+
 					// set id of node's object
-					this.get('object').set('id',res.id);
-                    
+					this.get('object').set('id',res.id);    
 					if (res.created){
 						// set the created date
 						this.get('object').set('created',res.created);
@@ -570,39 +570,44 @@ Ext.define(&#39;amdaModel.InteractiveNode&#39;, {
 								var me = this;
 								myDesktopApp.getLoadedModule(moduleId, true, function (module) {
 									var editedNode = module.getLinkedNode();
-								// file node is not linked directly to the module				    
-								var isThisFile = false;
-							
-								if (editedNode && editedNode.$className == 'amdaModel.MyDataParamNode')                                        
-									if (editedNode.get('fileObject').get('fileName') == me.get('text'))
-										isThisFile = true;  
-                                        
-								if (me.$className == 'amdaModel.DerivedParamNode')
-								{
-									var obj = {
-										paramId : 'ws_'+me.get('text')
-									};
-									AmdaAction.compilParamDelete(obj);
-								}
-                                        	
-								if (editedNode === me || isThisFile){
-									var newNode = Ext.ModelManager.create({leaf : true}, me.$className);
-									// several tabs could be connected to one node
-									if (moduleId === myDesktopApp.dynamicModules.plot.id) {
-										var linkedNodes = module.linkedNodes;
-																																		
-										if (linkedNodes) {
-											linkedNodes.each(function(key, value){						      
-												if (value === me) {	 
-													linkedNodes.replace(key,newNode);
-													var tabPanel = module.getUiContent().tabPanel.items.getByKey(key);
-													tabPanel.setObject(Ext.create(amdaModel.Plot.$className, {}));						 
-												}	
-											}, me);
-										}					  					 	
-									} 
-									newNode.editInModule();
-								}
+									
+									// file node is not linked directly to the module				    
+									var isThisFile = false;
+									if (editedNode && editedNode.$className == 'amdaModel.MyDataParamNode')                                        
+										if (editedNode.get('fileObject').get('fileName') == me.get('text'))
+											isThisFile = true; 
+										
+									// node was created BEFORE tree loading; node.id are different ; but it is the same node 
+									if ( editedNode.get('id') == me.get('id') && editedNode !== me ) {
+										module.setLinkedNode(me);
+										isThisFile = true;
+									}
+									
+									if (me.$className == 'amdaModel.DerivedParamNode') {
+										var obj = {
+											paramId : 'ws_'+me.get('text')
+										};
+										AmdaAction.compilParamDelete(obj);
+									}
+									
+									if (editedNode === me || isThisFile ){  
+										var newNode = Ext.ModelManager.create({leaf : true}, me.$className);
+										// several tabs could be connected to one node
+										if (moduleId === myDesktopApp.dynamicModules.plot.id) {
+											var linkedNodes = module.linkedNodes;
+																																			
+											if (linkedNodes) {
+												linkedNodes.each(function(key, value){						      
+													if (value === me) {	 
+														linkedNodes.replace(key,newNode);
+														var tabPanel = module.getUiContent().tabPanel.items.getByKey(key);
+														tabPanel.setObject(Ext.create(amdaModel.Plot.$className, {}));						 
+													}	
+												}, me);
+											}					  					 	
+										} 
+										newNode.editInModule();
+									}
 								});				                                        
 							}
 						}