CDPP / AMDA_IHM

Commit 234503174fccaf5674a637a13a41d96671516fe1

Authored by Benjamin Renard
1 parent f6539f85
Exists in master and in 82 other branches 10098, 10178, 5390, 6629, 7494, 7616, 8459, 8528, 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, cu2022, density_maps, develop, epn-tap, master_vge, mlplasmas, openam, rm_6912_bis, save-other-requests, special-params, test-merge, ws_get_catalog

Restore SAMP

Showing 1 changed file with 26 additions and 5 deletions   Show diff stats
Inline Side-by-side
js/app/models/ExecutableNode.js
  Diff comments   View file @2345031
... ... @@ -49,7 +49,8 @@ Ext.define('amdaModel.ExecutableNode', {
49 49  
50 50 var jsonObject = this.get('object').getJsonValues();
51 51 if (opts && opts.sendToSamp) {
52   - opts.sendToSamp = true;
  52 + jsonObject.sendToSamp = true;
  53 + opts.clientId = opts.clientId ? opts.clientId : 'hub';
53 54 }
54 55  
55 56 if (!loadMask.isMasked())
... ... @@ -79,15 +80,35 @@ Ext.define('amdaModel.ExecutableNode', {
79 80 module.updateInteractiveSession(res, true);
80 81 });
81 82 }
82   - else {
83   - /*if (res.sendToSamp) {
  83 + else if (!res.id && res.download) {
  84 + //Download TT / Cat
  85 + if (res.sendToSamp) {
84 86 myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.interop.id, true, function (module) {
85 87 Ext.Array.each(res.download, function(download) {
86   - module.sendVOTable(download, clientId ? clientId : 'hub');
  88 + module.sendVOTable(download, opts.clientId);
87 89 });
88 90 });
89 91 return;
90   - }*/
  92 + } else if (res.compression) {
  93 + window.location.href = res.download;
  94 + }
  95 + else {
  96 + window.open(res.download, '_blank');
  97 + }
  98 + return;
  99 + }
  100 + else {
  101 + if (res.sendToSamp) {
  102 + // Send to SAMP from Download UI
  103 + var files = res.result.split(",");
  104 + myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.interop.id, true, function (module) {
  105 + Ext.each(files, function(file) {
  106 + var href = 'data/'+sessionID+'/RES/'+ res.folder + '/' + file;
  107 + module.sendVOTable(href, opts.clientId);
  108 + });
  109 + });
  110 + return;
  111 + }
91 112  
92 113 if (logExecTime && res.exectime && (res.exectime != 0)) {
93 114 console.log("CMD EXEC TIME FOR "+res.id+" = "+res.exectime+"ms");
... ...