CDPP / AMDA_IHM

Commit 8497e83c161efce8a9ba2394fcb0777b1b905667

Authored by Elena.Budnik
1 parent ce38e649
Exists in master and in 111 other branches 10098, 10178, 5390, 6629, 6728, 6920, 7494, 7497, 7616, 8459, 8528, 8928, 9014, 9016Bis, 9017, 9049, 9084, 9259, 9326, 9345, 9505, 9660, 9750, 9750.bck, 9800, 9980, FER_10285, FER_10400, FER_10435, FER_10557, FER_10663, FER_10765, FER_10828, FER_10828_2, FER_10829, FER_10836, FER_10852, FER_10934, FER_11100, FER_11242, FER_11478, FER_11500, FER_11537, FER_11586, FER_11588, FER_5119, FER_5165, FER_6265, FER_6860, FER_6899, FER_6951, FER_7618, FER_7862, FER_8455, FER_9629, FER_9660, FER_9915, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, MAZ_10936, MAZ_11362, MAZ_11427, MAZ_6018, MAZ_9016_New, MAZ_FIX_9016, New_ColorMaps, SpeasyGet, akkodis/amdadev, alias, amdadev, amdadev_test, anr_tempete, catalog-histo, create-user, cu2022, data-activities, density_maps, develop, epn-tap, expression-parser-bre, frames-transformation, hapi, homePage, install-rework, master_vge, minimize, mlplasmas, multiplot, new-save-plot-request, openam, plot-request, plot-request-update, plot-tt-catalog, remoteData, rm_5118, rm_5776, rm_6912, rm_6912_bis, rm_7926, rm_8932, save-other-requests, save-plot, save-plot-request, shared-objects-updater, special-params, sum-components-indexes, test-merge, ws_get_catalog

redmine 5515

Showing 2 changed files with 25 additions and 24 deletions   Show diff stats
Inline Side-by-side
js/app/views/ParameterUI.js
  Diff comments   View file @8497e83
... ... @@ -299,19 +299,19 @@ Ext.define('amdaUI.ParameterUI',
299 299 notifyEnter : function(ddSource, e, data) {},
300 300 notifyOver : function(ddSource, e, data)
301 301 {
302   - if (data.records[0].data.nodeType == 'localParam' && data.records[0].get('notyet'))
  302 + if (data.records[0].get('nodeType') == 'localParam' && data.records[0].get('notyet'))
303 303 {
304 304 this.valid = false;
305 305 return this.dropNotAllowed;
306 306 }
307 307  
308   - if (((data.records[0].data.nodeType == 'localParam') ||
309   - (data.records[0].data.nodeType == 'remoteParam') ||
310   - (data.records[0].data.nodeType == 'remoteSimuParam') ||
311   - (data.records[0].data.nodeType == 'derivedParam') ||
312   - (data.records[0].data.nodeType == 'myDataParam') ||
313   - (data.records[0].data.nodeType == 'alias')) &&
314   - //(data.records[0].data.leaf) &&
  308 + if (((data.records[0].get('nodeType') == 'localParam') ||
  309 + (data.records[0].get('nodeType') == 'remoteParam') ||
  310 + (data.records[0].get('nodeType') == 'remoteSimuParam') ||
  311 + (data.records[0].get('nodeType') == 'derivedParam') ||
  312 + (data.records[0].get('nodeType')== 'myDataParam') ||
  313 + (data.records[0].get('nodeType') == 'alias')) &&
  314 + (data.records[0].isLeaf() || data.records[0].get('isParameter')) &&
315 315 !(data.records[0].data.disable))
316 316 {
317 317 this.valid = true;
... ... @@ -326,7 +326,7 @@ Ext.define('amdaUI.ParameterUI',
326 326 return false;
327 327 var nameToSent;
328 328 var components = null;
329   - switch (data.records[0].data.nodeType)
  329 + switch (data.records[0].get('nodeType'))
330 330 {
331 331 case 'localParam' :
332 332 case 'remoteParam' :
... ...
js/app/views/SearchUI.js
  Diff comments   View file @8497e83
... ... @@ -346,24 +346,25 @@ Ext.define('amdaUI.SearchUI',
346 346 notifyEnter : function(ddSource, e, data){ },
347 347 notifyOver : function(ddSource, e, data)
348 348 {
349   - if (data.records[0].data.nodeType == 'localParam' && data.records[0].get('notyet')) {
  349 + if (data.records[0].get('nodeType') == 'localParam' && data.records[0].get('notyet')) {
350 350 this.valid = false;
351 351 return this.dropNotAllowed;
352 352 }
353   - if (((data.records[0].data.nodeType == 'localParam') ||
354   - (data.records[0].data.nodeType == 'remoteParam') ||
355   - (data.records[0].data.nodeType == 'remoteSimuParam') ||
356   - (data.records[0].data.nodeType == 'derivedParam') ||
357   - (data.records[0].data.nodeType == 'myDataParam') ||
358   - (data.records[0].data.nodeType == 'alias'))&&
359   - //(data.records[0].data.leaf) &&
360   - !data.records[0].data.disable)
361   - {
362   - this.valid = true;
363   - return this.dropAllowed;
364   - }
365   - this.valid = false;
366   - return this.dropNotAllowed;
  353 + if (((data.records[0].get('nodeType') == 'localParam') ||
  354 + (data.records[0].get('nodeType') == 'remoteParam') ||
  355 + (data.records[0].get('nodeType') == 'remoteSimuParam') ||
  356 + (data.records[0].get('nodeType') == 'derivedParam') ||
  357 + (data.records[0].get('nodeType') == 'myDataParam') ||
  358 + (data.records[0].get('nodeType') == 'alias')) &&
  359 + (data.records[0].isLeaf() || data.records[0].get('isParameter')) &&
  360 + !data.records[0].data.disable)
  361 + {
  362 + this.valid = true;
  363 + return this.dropAllowed;
  364 + }
  365 +
  366 + this.valid = false;
  367 + return this.dropNotAllowed;
367 368 },
368 369 notifyDrop : function(ddSource, e, data)
369 370 {
... ...