CDPP / AMDA_IHM

Commit 2bf065def44bacdf329690ce60e4c13ed2efb9f7

Authored by Elena.Budnik
2 parents 67a09be7 a1313692
Exists in master and in 100 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, amdadev, amdadev_test, anr_tempete, catalog-histo, create-user, cu2022, density_maps, develop, epn-tap, expression-parser-bre, frames-transformation, hapi, homePage, master_vge, mlplasmas, multiplot, new-save-plot-request, openam, plot-request, remoteData, rm_5776, rm_6912, rm_6912_bis, rm_7926, rm_8932, save-other-requests, special-params, test-merge, ws_get_catalog

Merge branch 'master' of https://gitlab.irap.omp.eu/CDPP/AMDA_IHM

Showing 2 changed files with 11 additions and 11 deletions   Show diff stats
Inline Side-by-side
js/app/controllers/AstroImagesModule.js
  Diff comments   View file @2bf065d
... ... @@ -17,7 +17,7 @@ Ext.define('amdaDesktop.AstroImagesModule', {
17 17 extend: 'amdaDesktop.AmdaModule',
18 18  
19 19 requires : [
20   - 'amdaUI.HstUI',
  20 +// 'amdaUI.HstUI',
21 21 'amdaUI.APISImagesUI'
22 22 ],
23 23  
... ... @@ -52,11 +52,11 @@ Ext.define('amdaDesktop.AstroImagesModule', {
52 52 title: 'APIS Archive',
53 53 xtype: 'panelAPIS',
54 54 id : 'apisPanel'
55   - },
56   - {
57   - title: 'MAST Archive',
58   - xtype: 'panelHst',
59   - id : 'hstPanel'
  55 +// },
  56 +// {
  57 +// title: 'MAST Archive',
  58 +// xtype: 'panelHst',
  59 +// id : 'hstPanel'
60 60 }
61 61 ]
62 62 }
... ... @@ -64,11 +64,11 @@ Ext.define('amdaDesktop.AstroImagesModule', {
64 64 });
65 65 }
66 66  
67   - var hstPanel = win.queryById('hstPanel');
  67 +// var hstPanel = win.queryById('hstPanel');
68 68 var apisPanel = win.queryById('apisPanel');
69 69  
70 70  
71   - hstPanel.setInterval(startDate,stopDate);
  71 +// hstPanel.setInterval(startDate,stopDate);
72 72 apisPanel.setInterval(startDate,stopDate);
73 73  
74 74 win.on({
... ... @@ -78,8 +78,8 @@ Ext.define('amdaDesktop.AstroImagesModule', {
78 78 {
79 79 win.doLayout();
80 80 var astrotabsUI = win.queryById('astrotabs');
81   - astrotabsUI.setActiveTab(apisPanel);
82   - hstPanel.forceRefresh();
  81 +// astrotabsUI.setActiveTab(apisPanel);
  82 +// hstPanel.forceRefresh();
83 83 apisPanel.forceRefresh();
84 84 },
85 85 scope : this
... ...
js/app/models/InteractiveNode.js
  Diff comments   View file @2bf065d
... ... @@ -296,7 +296,7 @@ Ext.define('amdaModel.InteractiveNode', {
296 296 // set ownerTree panel as the active tab - to enable selection of this node his ownerTree must have a view
297 297 this.myGetOwnerTree().ownerCt.setActiveTab(this.myGetOwnerTree());
298 298 }
299   - if(opt.notDisplayMsg){
  299 + if(opt && opt.notDisplayMsg){
300 300 //do nothing
301 301 }else{
302 302 Ext.Msg.alert('Complete', 'New object '+this.get('object').get('name')+' has been created');
... ...