Commit 9b36ce292d72675b1fd2028a4ad162e834524b92
1 parent
bf776dc8
Exists in
master
and in
107 other branches
clean up
Showing
2 changed files
with
31 additions
and
40 deletions
Show diff stats
js/app/views/ParameterUI.js
| @@ -28,7 +28,6 @@ Ext.define('amdaUI.ParameterUI', | @@ -28,7 +28,6 @@ Ext.define('amdaUI.ParameterUI', | ||
| 28 | // load object into form | 28 | // load object into form |
| 29 | this.formPanel.getForm().loadRecord(this.object); | 29 | this.formPanel.getForm().loadRecord(this.object); |
| 30 | var paramArgsPlug = this.getPlugin('derived-param-arguments-plugin'); | 30 | var paramArgsPlug = this.getPlugin('derived-param-arguments-plugin'); |
| 31 | - | ||
| 32 | if (paramArgsPlug) | 31 | if (paramArgsPlug) |
| 33 | paramArgsPlug.onApply = this.onApplyParameterArgs; | 32 | paramArgsPlug.onApply = this.onApplyParameterArgs; |
| 34 | }, | 33 | }, |
| @@ -49,9 +48,9 @@ Ext.define('amdaUI.ParameterUI', | @@ -49,9 +48,9 @@ Ext.define('amdaUI.ParameterUI', | ||
| 49 | 48 | ||
| 50 | addParam : function(newParamName, isLeaf, needArgs, components) | 49 | addParam : function(newParamName, isLeaf, needArgs, components) |
| 51 | { | 50 | { |
| 52 | - if (!isLeaf || needArgs || components) | ||
| 53 | - this.editParameterArgs(newParamName, components); | ||
| 54 | - else | 51 | + //if (!isLeaf || needArgs || components) |
| 52 | + // this.editParameterArgs(newParamName, components); | ||
| 53 | + //else | ||
| 55 | this.addParamInEditor(newParamName); | 54 | this.addParamInEditor(newParamName); |
| 56 | }, | 55 | }, |
| 57 | 56 | ||
| @@ -85,7 +84,6 @@ Ext.define('amdaUI.ParameterUI', | @@ -85,7 +84,6 @@ Ext.define('amdaUI.ParameterUI', | ||
| 85 | } | 84 | } |
| 86 | 85 | ||
| 87 | var paramArgsPlug = this.getPlugin('derived-param-arguments-plugin'); | 86 | var paramArgsPlug = this.getPlugin('derived-param-arguments-plugin'); |
| 88 | - | ||
| 89 | if (paramArgsPlug) { | 87 | if (paramArgsPlug) { |
| 90 | var workinRequestParamObject = Ext.create('amdaModel.RequestParamObject', paramObj); | 88 | var workinRequestParamObject = Ext.create('amdaModel.RequestParamObject', paramObj); |
| 91 | paramArgsPlug.show('derived-param-arguments-plugin', workinRequestParamObject); | 89 | paramArgsPlug.show('derived-param-arguments-plugin', workinRequestParamObject); |
| @@ -140,38 +138,19 @@ Ext.define('amdaUI.ParameterUI', | @@ -140,38 +138,19 @@ Ext.define('amdaUI.ParameterUI', | ||
| 140 | this.constructionField.setValue(expression); | 138 | this.constructionField.setValue(expression); |
| 141 | }, | 139 | }, |
| 142 | 140 | ||
| 143 | - /** | ||
| 144 | - * Parameter compilation | ||
| 145 | - */ | ||
| 146 | - compilParam : function($action) | ||
| 147 | - { | ||
| 148 | - var obj = { | ||
| 149 | - paramId : 'ws_'+this.object.get('name') | ||
| 150 | - }; | ||
| 151 | - AmdaAction.compilParam(obj, function (result, e) { | ||
| 152 | - if (!result || !result.success) | ||
| 153 | - { | ||
| 154 | - if (result.message) | ||
| 155 | - myDesktopApp.warningMsg(result.message); | ||
| 156 | - else | ||
| 157 | - myDesktopApp.warningMsg('Unknown error during parameter compilation'); | ||
| 158 | - return; | ||
| 159 | - } | ||
| 160 | - }); | ||
| 161 | - }, | ||
| 162 | - | ||
| 163 | - | ||
| 164 | 141 | ||
| 165 | /** | 142 | /** |
| 166 | * Generate info for parameter desplay | 143 | * Generate info for parameter desplay |
| 167 | */ | 144 | */ |
| 168 | - generateParamInfo : function($action) | 145 | + generateParamInfo : function(onSuccess) |
| 169 | { | 146 | { |
| 170 | var me = this; | 147 | var me = this; |
| 171 | var paramModule = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.param.id); | 148 | var paramModule = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.param.id); |
| 172 | 149 | ||
| 173 | var obj = { | 150 | var obj = { |
| 174 | - paramId : 'ws_'+this.object.get('name') | 151 | + paramId : 'ws_'+this.object.get('name'), |
| 152 | + buildchain:this.object.get('buildchain'), | ||
| 153 | + timestep:this.object.get('timestep') | ||
| 175 | }; | 154 | }; |
| 176 | AmdaAction.generateParamInfo(obj, function (result, e) { | 155 | AmdaAction.generateParamInfo(obj, function (result, e) { |
| 177 | if (!result || !result.success) | 156 | if (!result || !result.success) |
| @@ -185,14 +164,16 @@ Ext.define('amdaUI.ParameterUI', | @@ -185,14 +164,16 @@ Ext.define('amdaUI.ParameterUI', | ||
| 185 | 164 | ||
| 186 | paramModule.linkedNode.get('object').set('dim_1', parseInt(result.dimensions.dim_1)); | 165 | paramModule.linkedNode.get('object').set('dim_1', parseInt(result.dimensions.dim_1)); |
| 187 | paramModule.linkedNode.get('object').set('dim_2', parseInt(result.dimensions.dim_2)); | 166 | paramModule.linkedNode.get('object').set('dim_2', parseInt(result.dimensions.dim_2)); |
| 188 | - paramModule.linkedNode.update({scope : me, | 167 | + if (onSuccess) |
| 168 | + onSuccess(); | ||
| 169 | +/* paramModule.linkedNode.update({scope : me, | ||
| 189 | failure: function(record, operation) { | 170 | failure: function(record, operation) { |
| 190 | 171 | ||
| 191 | }, | 172 | }, |
| 192 | callback: function() { | 173 | callback: function() { |
| 193 | } | 174 | } |
| 194 | }); | 175 | }); |
| 195 | - | 176 | + */ |
| 196 | }); | 177 | }); |
| 197 | }, | 178 | }, |
| 198 | 179 | ||
| @@ -224,14 +205,23 @@ Ext.define('amdaUI.ParameterUI', | @@ -224,14 +205,23 @@ Ext.define('amdaUI.ParameterUI', | ||
| 224 | //synchronize objects | 205 | //synchronize objects |
| 225 | this.object = paramobj; | 206 | this.object = paramobj; |
| 226 | if (toRename) paramModule.linkedNode.toRename = true; | 207 | if (toRename) paramModule.linkedNode.toRename = true; |
| 227 | - } | ||
| 228 | - paramModule.linkedNode.create({scope : this, callback : this.generateParamInfo}); | ||
| 229 | - paramModule.linkedNode.set('iconCls', 'icon-scalar'); | ||
| 230 | - paramModule.linkedNode.set('isParameter', true); | 208 | + } |
| 209 | + loadMask.show(); | ||
| 210 | + this.generateParamInfo(function () { | ||
| 211 | + paramModule.linkedNode.set('isParameter', true); | ||
| 212 | + paramModule.linkedNode.create({scope : this, callback : function() { | ||
| 213 | + loadMask.hide(); | ||
| 214 | + }}); | ||
| 215 | + }); | ||
| 231 | } else | 216 | } else |
| 232 | { | 217 | { |
| 233 | paramModule.linkedNode.set('contextNode',paramModule.contextNode); | 218 | paramModule.linkedNode.set('contextNode',paramModule.contextNode); |
| 234 | - paramModule.linkedNode.update({scope : this, callback : this.generateParamInfo}); | 219 | + loadMask.show(); |
| 220 | + this.generateParamInfo(function () { | ||
| 221 | + paramModule.linkedNode.update({scope : this, callback : function() { | ||
| 222 | + loadMask.hide(); | ||
| 223 | + }}); | ||
| 224 | + }); | ||
| 235 | } | 225 | } |
| 236 | } | 226 | } |
| 237 | }, | 227 | }, |
| @@ -357,11 +347,11 @@ Ext.define('amdaUI.ParameterUI', | @@ -357,11 +347,11 @@ Ext.define('amdaUI.ParameterUI', | ||
| 357 | return this.dropNotAllowed; | 347 | return this.dropNotAllowed; |
| 358 | }, | 348 | }, |
| 359 | notifyDrop : function(ddSource, e, data) | 349 | notifyDrop : function(ddSource, e, data) |
| 360 | - { | 350 | + { |
| 361 | if (!this.valid) | 351 | if (!this.valid) |
| 362 | return false; | 352 | return false; |
| 363 | var nameToSent; | 353 | var nameToSent; |
| 364 | - var components = null; | 354 | + var components = null; |
| 365 | switch (data.records[0].get('nodeType')) | 355 | switch (data.records[0].get('nodeType')) |
| 366 | { | 356 | { |
| 367 | case 'localParam' : | 357 | case 'localParam' : |
| @@ -411,6 +401,7 @@ Ext.define('amdaUI.ParameterUI', | @@ -411,6 +401,7 @@ Ext.define('amdaUI.ParameterUI', | ||
| 411 | } | 401 | } |
| 412 | break; | 402 | break; |
| 413 | default : | 403 | default : |
| 404 | + | ||
| 414 | return false; | 405 | return false; |
| 415 | } | 406 | } |
| 416 | var paramModule = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.param.id); | 407 | var paramModule = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.param.id); |
| @@ -549,7 +540,7 @@ Ext.define('amdaUI.ParameterUI', | @@ -549,7 +540,7 @@ Ext.define('amdaUI.ParameterUI', | ||
| 549 | 540 | ||
| 550 | me.fieldName.validFlag = true; | 541 | me.fieldName.validFlag = true; |
| 551 | me.fieldName.validate(); | 542 | me.fieldName.validate(); |
| 552 | - me.saveProcess(false); | 543 | + me.saveProcess(false); |
| 553 | }); | 544 | }); |
| 554 | } | 545 | } |
| 555 | } | 546 | } |
update_amda/updateEnv.sh
| @@ -39,9 +39,9 @@ if [[ ${AMDAINTERNALDIR: -1} != "/" ]]; then | @@ -39,9 +39,9 @@ if [[ ${AMDAINTERNALDIR: -1} != "/" ]]; then | ||
| 39 | fi | 39 | fi |
| 40 | 40 | ||
| 41 | #SPASE Registry definitions | 41 | #SPASE Registry definitions |
| 42 | -export SPASE_REPO="http://apus.irap.omp.eu:8080/amda-registry/resolver" | 42 | +export SPASE_REPO="http://amda-registry.irap.omp.eu/resolver" |
| 43 | #Remote SPASE Registry to get Person' Info | 43 | #Remote SPASE Registry to get Person' Info |
| 44 | export SPASE_REMOTE="http://www.spase-group.org/smwg/resolver" | 44 | export SPASE_REMOTE="http://www.spase-group.org/smwg/resolver" |
| 45 | # for SPASE Registy MAJ | 45 | # for SPASE Registy MAJ |
| 46 | -export SPASE_HOST=apus.irap.omp.eu | 46 | +export SPASE_HOST=amda-registry.irap.omp.eu |
| 47 | export SPASE_ROOT="/usr/share/tomcat/webapps/amda-registry/metadata" | 47 | export SPASE_ROOT="/usr/share/tomcat/webapps/amda-registry/metadata" |