clean up

Benjamin Renard
1 parent bf776dc8
Showing 2 changed files with 31 additions and 40 deletions Show diff stats
js/app/views/ParameterUI.js
update_amda/updateEnv.sh
@@ -28,7 +28,6 @@ Ext.define(&#39;amdaUI.ParameterUI&#39;,
 		// load object into form
 		this.formPanel.getForm().loadRecord(this.object);
 		var paramArgsPlug = this.getPlugin('derived-param-arguments-plugin');
-		
 		if (paramArgsPlug)
 			paramArgsPlug.onApply = this.onApplyParameterArgs;
 	},
@@ -49,9 +48,9 @@ Ext.define(&#39;amdaUI.ParameterUI&#39;,
  
 	addParam : function(newParamName, isLeaf, needArgs, components) 
 	{
-		if (!isLeaf || needArgs || components)
-			this.editParameterArgs(newParamName, components);
-		else
+		//if (!isLeaf || needArgs || components)
+		//	this.editParameterArgs(newParamName, components);
+		//else
 			this.addParamInEditor(newParamName);
 	},
  
@@ -85,7 +84,6 @@ Ext.define(&#39;amdaUI.ParameterUI&#39;,
 		}
  
 		var paramArgsPlug = this.getPlugin('derived-param-arguments-plugin');
-		
 		if (paramArgsPlug) {
 			var workinRequestParamObject = Ext.create('amdaModel.RequestParamObject', paramObj);
 			paramArgsPlug.show('derived-param-arguments-plugin', workinRequestParamObject);
@@ -140,38 +138,19 @@ Ext.define(&#39;amdaUI.ParameterUI&#39;,
 		this.constructionField.setValue(expression);
 	},
  
-	/**
-	 * Parameter compilation
-	 */
-	compilParam : function($action) 
-	{
-		var obj = {
-			paramId : 'ws_'+this.object.get('name')
-		};
-		AmdaAction.compilParam(obj, function (result, e) {
-			if (!result || !result.success)
-			{
-				if (result.message)
-					myDesktopApp.warningMsg(result.message);
-				else
-					myDesktopApp.warningMsg('Unknown error during parameter compilation');
-				return;
-			}
-		});
-	},
-
-
  
         /** 
  	 * Generate info for parameter desplay
          */
-        generateParamInfo : function($action)
+        generateParamInfo : function(onSuccess)
         {
 	   var me = this;
 	   var paramModule = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.param.id);
  
            var obj = {
-                        paramId : 'ws_'+this.object.get('name')
+                        paramId : 'ws_'+this.object.get('name'),
+                        buildchain:this.object.get('buildchain'),
+                        timestep:this.object.get('timestep')
                 };
                 AmdaAction.generateParamInfo(obj, function (result, e) {
 	 if (!result || !result.success)
@@ -185,14 +164,16 @@ Ext.define(&#39;amdaUI.ParameterUI&#39;,
  
                     paramModule.linkedNode.get('object').set('dim_1', parseInt(result.dimensions.dim_1));
                     paramModule.linkedNode.get('object').set('dim_2', parseInt(result.dimensions.dim_2));  
-                    paramModule.linkedNode.update({scope : me, 
+                    if (onSuccess)
+                        onSuccess();
+/*                    paramModule.linkedNode.update({scope : me, 
                         failure: function(record, operation) {
  
                         },
                         callback: function() {
                                                    }
                     });
-                  			
+    */              			
                 });
         },
  
@@ -224,14 +205,23 @@ Ext.define(&#39;amdaUI.ParameterUI&#39;,
 					//synchronize objects
 					this.object = paramobj;
 					if (toRename) paramModule.linkedNode.toRename = true;
-				}                
-				paramModule.linkedNode.create({scope : this, callback : this.generateParamInfo});
-				paramModule.linkedNode.set('iconCls', 'icon-scalar');
-				paramModule.linkedNode.set('isParameter', true);            
+				} 
+                                                                                loadMask.show();
+				this.generateParamInfo(function () {
+                                                                                    paramModule.linkedNode.set('isParameter', true); 
+                                                                                    paramModule.linkedNode.create({scope : this, callback : function() {
+                                                                                            loadMask.hide();
+                                                                                    }});
+                                                                                });   
 			} else 
 			{            
 				paramModule.linkedNode.set('contextNode',paramModule.contextNode); 
-				paramModule.linkedNode.update({scope : this, callback : this.generateParamInfo});				
+                                                                                loadMask.show();
+                                                                                this.generateParamInfo(function () {
+                                                                                    paramModule.linkedNode.update({scope : this, callback : function() {
+                                                                                            loadMask.hide();
+                                                                                    }});
+                                                                                });   
 			}
 		}        
 	},
@@ -357,11 +347,11 @@ Ext.define(&#39;amdaUI.ParameterUI&#39;,
 							return this.dropNotAllowed;
 						},
 						notifyDrop  : function(ddSource, e, data)
-						{			          
+						{	
 							if (!this.valid)
 								return false;
 							var nameToSent;
-							var components = null;
+							var components = null;                                                                                                                                            
 							switch (data.records[0].get('nodeType'))
 							{
 								case 'localParam' :
@@ -411,6 +401,7 @@ Ext.define(&#39;amdaUI.ParameterUI&#39;,
 									}
 									break;
 								default :
+                                                                                                                                                              
 									return false;
 							}
 							var paramModule = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.param.id);
@@ -549,7 +540,7 @@ Ext.define(&#39;amdaUI.ParameterUI&#39;,
  
 									me.fieldName.validFlag = true;
 									me.fieldName.validate();
-									me.saveProcess(false);
+                                                                                                                                                                                    me.saveProcess(false);
 								});							  
 							}
 						}
@@ -39,9 +39,9 @@ if [[ ${AMDAINTERNALDIR: -1} != &quot;/&quot; ]]; then
 fi
  
 #SPASE Registry definitions
-export SPASE_REPO="http://apus.irap.omp.eu:8080/amda-registry/resolver"
+export SPASE_REPO="http://amda-registry.irap.omp.eu/resolver"
 #Remote SPASE Registry to get Person' Info
 export SPASE_REMOTE="http://www.spase-group.org/smwg/resolver"
 # for SPASE Registy MAJ
-export SPASE_HOST=apus.irap.omp.eu
+export SPASE_HOST=amda-registry.irap.omp.eu
 export SPASE_ROOT="/usr/share/tomcat/webapps/amda-registry/metadata"