Commit 240945c563e022b98b6a2bf5b9c9631d427cd1f7
Exists in
master
and in
89 other branches
Merge branch 'master' into create-user
Showing
2 changed files
with
5 additions
and
5 deletions
Show diff stats
desktop.php
... | ... | @@ -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
... | ... | @@ -224,7 +224,7 @@ Ext.define('amdaPlotObj.PlotObjectConfig', { |
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 | ], |
... | ... |