rm-6903 corrected

Hacene SI HADJ MOHAND
1 parent a52d11df
Showing 2 changed files with 26 additions and 15 deletions Show diff stats
js/app/models/InteractiveNode.js
js/app/views/CatalogUI.js
@@ -194,12 +194,18 @@ Ext.define(&#39;amdaModel.InteractiveNode&#39;, {
  
 					if (opt)
 					{
+
 						var scope = opt.scope ? opt.scope : this;
 						if (opt.callback)
 							opt.callback.call(scope,'update');
+                                                                             
 					}
-					
-					Ext.Msg.alert('Complete', 'Object '+this.get('object').get('name')+' has been modified',  this);
+                                                                                                  if(opt.notDisplayMsg){
+                                                                                                       //do nothing 
+                                                                                                       }else{ 
+					Ext.Msg.alert('Complete', 'Object '+this.get('object').get('name')+' has been modified');
+                                                                                                   }
+
 					// fix the modifications for object
 					this.get('object').commit();
  
@@ -290,8 +296,12 @@ Ext.define(&#39;amdaModel.InteractiveNode&#39;, {
 						// set ownerTree panel as the active tab - to enable selection of this node his ownerTree must have a view
 						this.myGetOwnerTree().ownerCt.setActiveTab(this.myGetOwnerTree());                        
 					}
-                    
-					Ext.Msg.alert('Complete', 'New object '+this.get('object').get('name')+' has been created'); 
+                                                                                                    if(opt.notDisplayMsg){
+                                                                                                        //do nothing
+                                                                                                        }else{ 
+                                                                                                                       Ext.Msg.alert('Complete', 'New object '+this.get('object').get('name')+' has been created'); 
+                                                                                                            }
+                                                                                                    
 					// expand the contextNode
 					this.get('contextNode').expand(false, function() {
 						if (!this.get('contextNode').findChild('text',this.get('text'))) {
@@ -117,7 +117,6 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
 		this.formPanel.getForm().findField('nbIntervals').setValue(this.object.get('nbIntervals'));
 	}, 
 	generateTT : function(){   
-                         console.log(this);
                        if(this.fclose()){
                         Ext.Msg.confirm('Generate TT', 'Current Catalog has been modified.\nDo you want to save it to include these changes in the generated Time Table ?' ,
                         function (btn, text){  
@@ -125,16 +124,18 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
                           // mark this.closed as true before the call to close() as that will fire the beforeclose event again
                           if(this.object.get('id') ==""){
                               // case of creation of catalog
-                          this.saveCatalog(true);
+                          this.saveCatalog(true,true);
                       }else{
                           // casse existing catalog
-                          this.saveProcess(false,true);
+                          this.saveProcess(false,true,true);
                       }
-                          return
-                          //win.close();
+                          return;
                           } 
                            }, this); 
  
+            }else{
+                this.createTT(this.object.get('id'));
+                return;
             }            
                     },
                     createTT : function(catId){
@@ -491,7 +492,7 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
 	/*	    
 	 * save method called by Save button
 	 */
-	saveProcess : function(toRename, onAfterSave)
+	saveProcess : function(toRename, onAfterSave, notDisplayMsg)
 	{
 		var module = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.catalog.id);
 		//  store / columns are the same - not needed to reconfigure grid
@@ -506,7 +507,7 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
 			var obj = module.linkedNode.get('object');                                                    
 			// synchronisation of objects
 			this.object = obj;
-			module.linkedNode.create({callback : function() {if (onAfterSave) this.createTT(this.object.get('id'));}, scope : this});
+			module.linkedNode.create({notDisplayMsg:notDisplayMsg, callback : function() {if (onAfterSave) this.createTT(this.object.get('id'));}, scope : this});
 		}
 		// if the name has been modified this is a creation
 		else if (this.fclose()) {         
@@ -527,14 +528,14 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
 					this.object = obj;
 					if (toRename) module.linkedNode.toRename = true;
 				} 
-				module.linkedNode.create({callback : function() {module.linkedNode.update({callback : function() {if (onAfterSave) this.createTT(this.object.get('id'));}, scope : this});}, scope : this});
+				module.linkedNode.create({callback : function() {module.linkedNode.update({notDisplayMsg:notDisplayMsg, callback : function() {if (onAfterSave) this.createTT(this.object.get('id'));}, scope : this},"",notDisplayMsg);}, scope : this});
 			} else {
 				//update				
-				module.linkedNode.update({callback : function() {if (onAfterSave) this.createTT(this.object.get('id'));}, scope : this});
+				module.linkedNode.update({notDisplayMsg:notDisplayMsg,callback : function() {if (onAfterSave) this.createTT(this.object.get('id'));}, scope : this});
 			}	
 		}
 	},
-        saveCatalog : function (onAfterSave){
+        saveCatalog : function (onAfterSave,notDisplayMsg){
             if (this.updateObject())
                 {
                         var basicForm = this.formPanel.getForm();      
@@ -585,7 +586,7 @@ Ext.define(&#39;amdaUI.CatalogUI&#39;, {
  
                                                 me.fieldName.validFlag = true;
                                                 me.fieldName.validate();
-                                                me.saveProcess(false, onAfterSave);
+                                                me.saveProcess(false, onAfterSave,notDisplayMsg);
                                         });
                                 });                            
                         }