CDPP / AMDA_IHM

Commit 240945c563e022b98b6a2bf5b9c9631d427cd1f7

Authored by Benjamin Renard
2 parents 1e8c4961 b59622f5
Exists in master and in 89 other branches 10098, 10178, 5390, 6629, 6728, 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, master_vge, mlplasmas, openam, remoteData, rm_6912, rm_6912_bis, rm_7926, rm_8932, save-other-requests, special-params, test-merge, ws_get_catalog

Merge branch 'master' into create-user

Showing 2 changed files with 5 additions and 5 deletions   Show diff stats
Inline Side-by-side
desktop.php
  Diff comments   View file @240945c
... ... @@ -4,8 +4,9 @@
4 4 * @version $Id: desktop.php 2934 2015-06-03 13:23:22Z elena $
5 5 *
6 6 */
7   -
  7 +
8 8 require_once('php/config.php');
  9 +
9 10 // error_reporting(E_ALL);
10 11 if (!isset($_POST['username'])) {
11 12 header('Location: index.html');
... ... @@ -13,8 +14,8 @@
13 14 }
14 15  
15 16 if (!isset($_POST['username'])) die('<a href="index.html">LOGIN SVP</a>');
16   -
17 17 $usrMgr = new UserMgr();
  18 +
18 19 $sessionID = $usrMgr->init();
19 20 if ($sessionID === FALSE) {
20 21 header('Location: index.html?error=1');
... ... @@ -109,7 +110,6 @@
109 110 var gatewayTimeout = '<?php if (defined('GATEWAY_TIMEOUT')) echo GATEWAY_TIMEOUT; else echo 300000; ?>'; // in msec
110 111  
111 112 var logExecTime = <?php echo (defined('LOG_EXEC_TIME') && (LOG_EXEC_TIME === TRUE) ? 'true' : 'false'); ?>;
112   -
113 113 //create mask class (LoadMask for elements has been deprecated, use Ext.dom.Element.mask & Ext.dom.Element.unmask)
114 114 var AMDAMask = new Ext.Class({
115 115 show : function(interactivePlot)
... ... @@ -175,7 +175,7 @@
175 175  
176 176 if (response && response.statusText) {
177 177 if (response.timedout)
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');
  178 + alert('Request processing time exceeds gateway timeout\n In case of parameter from Remote Bases : please re-launch the same request in 10 min,\n otherwise select "non-screen" FileOutput or contact AMDA team');
179 179 else
180 180 alert(response.statusText);
181 181 }
... ...
js/app/models/PlotObjects/PlotObjectConfig.js
  Diff comments   View file @240945c
... ... @@ -224,7 +224,7 @@ Ext.define(&#39;amdaPlotObj.PlotObjectConfig&#39;, {
224 224 ],
225 225  
226 226 availableFileOutputsForPng : [
227   - {'key' : 'INTERACTIVE', 'value' : 'Interactive mode'},
  227 + {'key' : 'INTERACTIVE', 'value' : 'screen'},
228 228 {'key' : 'TGZ', 'value' : 'tar+gzip archive'},
229 229 {'key' : 'ZIP', 'value' : 'zip archive'}
230 230 ],
... ...