CDPP / AMDA_IHM

Commit 9141068860d792284d68318f0a22d4301890ba9f

Authored by Myriam Bouchemit
2 parents edc6e5cb 74c32080
Exists in master and in 94 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, amdadev, amdadev_test, anr_tempete, create-user, cu2022, density_maps, develop, epn-tap, expression-parser-bre, frames-transformation, hapi, master_vge, mlplasmas, multiplot, openam, remoteData, 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 1 changed file with 7 additions and 8 deletions   Show diff stats
Inline Side-by-side
desktop.php
  Diff comments   View file @9141068
... ... @@ -5,7 +5,6 @@
5 5 *
6 6 */
7 7  
8   -
9 8 require_once('php/config.php');
10 9 // error_reporting(E_ALL);
11 10 if (!isset($_POST['username'])) {
... ... @@ -40,8 +39,8 @@
40 39 <link rel="icon" href="favicon.ico" type="image/x-icon">
41 40 <link rel="shortcut icon" href="favicon.ico" type="image/x-icon">
42 41  
43   -<!-- <script type="text/javascript" src="js/lib/ext/builds/ext-core.js"></script> -->
44   -<!-- <script type="text/javascript" src="js/lib/ext/bootstrap.js"></script> -->
  42 +<!-- <script type="text/javascript" src="js/lib/ext/builds/ext-core.js"></script> -->
  43 +<!-- <script type="text/javascript" src="js/lib/ext/bootstrap.js"></script> -->
45 44 <!-- <script type="text/javascript" src="js/lib/ext/ext-all-debug-w-comments.js"></script> -->
46 45 <script type="text/javascript" src="js/lib/ext/ext-all.js"></script>
47 46 <!-- <script type="text/javascript" src="js/lib/ext/ext-all-dev.js"></script> -->
... ... @@ -85,10 +84,10 @@
85 84  
86 85 var myDesktopApp;
87 86  
88   - var isMigration = true;
  87 + var isMigration = false;
89 88 var sessionID = '<?php echo $sessionID; ?>';
90 89 var isFirstVisit = '<?php echo $usrMgr->isFirst; ?>';
91   - var isOldWS = '<?php echo $usrMgr->isOldWS; ?>';
  90 + var isOldWS = false; // '<#?php echo $usrMgr->isOldWS; ?>';
92 91 var isSpecialInfo = '<?php echo $usrMgr->isSpecialInfo; ?>';
93 92 var isNewInfo = '<?php echo $usrMgr->isNewInfo; ?>';
94 93 var news = '../data/' + sessionID + '/INFO';
... ... @@ -176,12 +175,12 @@
176 175  
177 176 if (response && response.statusText) {
178 177 if (response.timedout)
179   - myDesktopApp.errorMsg('Request processing time exceeds gateway timeout.<br/>In case of parameter from Remote Bases : please re-launch the same request in 10 min,<br/>otherwise contact AMDA team');
  178 + alert('Request processing time exceeds gateway timeout.<br/>In case of parameter from Remote Bases : please re-launch the same request in 10 min,<br/>otherwise contact AMDA team');
180 179 else
181   - myDesktopApp.errorMsg(response.statusText);
  180 + alert(response.statusText);
182 181 }
183 182 else
184   - myDesktopApp.errorMsg('Communication failure');
  183 + alert('Communication failure');
185 184 });
186 185  
187 186 // backspace key disable
... ...