CDPP / AMDA_IHM

Commit 07e4ac1176f92925c9768c5e24329f4dddf212ca

Authored by Erdogan Furkan
1 parent ae2e30bd
Exists in master and in 40 other branches FER_10400, FER_10435, 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_6265, FER_6860, FER_6951, FER_7618, FER_7862, FER_8455, FER_9629, FER_9915, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, MAZ_10936, MAZ_11362, MAZ_11427, MAZ_9016_New, MAZ_FIX_9016, SpeasyGet, akkodis/amdadev, amdadev, amdadev_test, density_maps, develop, openam

IHM part allowing drag/drop for creation of a derived parameter

Showing 1 changed file with 11 additions and 3 deletions   Show diff stats
Inline Side-by-side
js/app/views/ParameterUI.js
  Diff comments   View file @07e4ac1
@@ -311,7 +311,9 @@ Ext.define('amdaUI.ParameterUI', @@ -311,7 +311,9 @@ Ext.define('amdaUI.ParameterUI',
311 (data.records[0].get('nodeType') == 'specialParam') || 311 (data.records[0].get('nodeType') == 'specialParam') ||
312 (data.records[0].get('nodeType') == 'myDataParam') || 312 (data.records[0].get('nodeType') == 'myDataParam') ||
313 (data.records[0].get('nodeType') == 'timeTable') || 313 (data.records[0].get('nodeType') == 'timeTable') ||
314 - (data.records[0].get('nodeType') == 'catalog') | 314 + (data.records[0].get('nodeType') == 'catalog') ||
  315 + (data.records[0].get('nodeType') == 'sharedtimeTable') ||
  316 + (data.records[0].get('nodeType') == 'sharedcatalog') ||
315 (data.records[0].get('nodeType') == 'alias')) && 317 (data.records[0].get('nodeType') == 'alias')) &&
316 (data.records[0].isLeaf() || data.records[0].get('isParameter')) && 318 (data.records[0].isLeaf() || data.records[0].get('isParameter')) &&
317 !(data.records[0].data.disable)) { 319 !(data.records[0].data.disable)) {
@@ -362,10 +364,16 @@ Ext.define('amdaUI.ParameterUI', @@ -362,10 +364,16 @@ Ext.define('amdaUI.ParameterUI',
362 nameToSent = data.records[0].get('id'); 364 nameToSent = data.records[0].get('id');
363 break; 365 break;
364 case 'timeTable': 366 case 'timeTable':
365 - nameToSent = data.records[0].get('text'); 367 + nameToSent = "tt_"+data.records[0].get('text');
366 break; 368 break;
367 case 'catalog': 369 case 'catalog':
368 - nameToSent = data.records[0].get('text'); 370 + nameToSent = "cat_"+data.records[0].get('text');
  371 + break;
  372 + case 'sharedtimeTable':
  373 + nameToSent = "sharedtimeTable"+data.records[0].get('text');
  374 + break;
  375 + case 'sharedcatalog':
  376 + nameToSent = "sharedcatalog_"+data.records[0].get('text');
369 break; 377 break;
370 case 'myDataParam': 378 case 'myDataParam':
371 var name = data.records[0].get('text'); 379 var name = data.records[0].get('text');