CDPP / AMDA_IHM

Commit 264edda70f54539983e2df81b189c614dd26d87a

Authored by Nathanael Jourdane
1 parent 33b0f682
Exists in master and in 112 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, livraison-akka, 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

Set product types to all when lauched from treeview

Showing 3 changed files with 11 additions and 12 deletions   Show diff stats
Inline Side-by-side
js/app/controllers/EpnTapModule.js
  Diff comments   View file @264edda
@@ -52,8 +52,6 @@ Ext.define('amdaDesktop.EpnTapModule', { @@ -52,8 +52,6 @@ Ext.define('amdaDesktop.EpnTapModule', {
52 this.granulesStore.removeAll(); 52 this.granulesStore.removeAll();
53 53
54 if(target) { 54 if(target) {
55 - var name = target[0].charAt(0).toUpperCase() + target[0].replace(/_/g, ' ').substr(1).toLowerCase();  
56 - this.targetNameCB.getStore().add({'id': target[0], 'name': name});  
57 this.targetNameCB.select(target[0]); 55 this.targetNameCB.select(target[0]);
58 this.productTypeCB.select(target[1]); 56 this.productTypeCB.select(target[1]);
59 this.getServices(); 57 this.getServices();
js/app/controllers/InteropModule.js
  Diff comments   View file @264edda
@@ -62,16 +62,17 @@ Ext.define('amdaDesktop.InteropModule', { @@ -62,16 +62,17 @@ Ext.define('amdaDesktop.InteropModule', {
62 if(!this.epntap) { 62 if(!this.epntap) {
63 this.epntap = Ext.create('amdaDesktop.EpnTapModule'); 63 this.epntap = Ext.create('amdaDesktop.EpnTapModule');
64 } 64 }
  65 + // [Target name, product type]
65 var icons_dic = { 66 var icons_dic = {
66 - 'icon-mercury': ['mercury', 'ts'],  
67 - 'icon-venus': ['venus', 'ts'],  
68 - 'icon-earth': ['earth', 'ts'],  
69 - 'icon-mars': ['mars', 'ts'],  
70 - 'icon-jupiter': ['jupiter', 'ts'],  
71 - 'icon-saturn': ['saturn', 'ts'],  
72 - 'icon-comet': ['comet', 'ts'],  
73 - 'icon-sw': ['all', 'ts'],  
74 - 'icon-solarsystem': ['all', 'ts'] 67 + 'icon-mercury': ['Mercury', 'all'],
  68 + 'icon-venus': ['Venus', 'all'],
  69 + 'icon-earth': ['Earth', 'all'],
  70 + 'icon-mars': ['Mars', 'all'],
  71 + 'icon-jupiter': ['Jupiter', 'all'],
  72 + 'icon-saturn': ['Saturn', 'all'],
  73 + 'icon-comet': ['Comet', 'all'],
  74 + 'icon-sw': ['', 'all'],
  75 + 'icon-solarsystem': ['', 'all']
75 } 76 }
76 this.epntap.loadTarget(icon_id ? icons_dic[icon_id]: false); 77 this.epntap.loadTarget(icon_id ? icons_dic[icon_id]: false);
77 }, 78 },
js/app/views/EpnTapUI.js
  Diff comments   View file @264edda
@@ -470,7 +470,7 @@ Ext.define('amdaUI.EpnTapUI', { @@ -470,7 +470,7 @@ Ext.define('amdaUI.EpnTapUI', {
470 } 470 }
471 }, 471 },
472 listeners: { 472 listeners: {
473 - select: function(cb, records) { 473 + change: function(cb, records) {
474 var val = cb.value[cb.value.length - 1]; 474 var val = cb.value[cb.value.length - 1];
475 if(val === 'all') { 475 if(val === 'all') {
476 cb.select(cb.store.getRange().slice(2)); 476 cb.select(cb.store.getRange().slice(2));