From 12374a02bc6c63fbc45f9debeb4db9ffebe76162 Mon Sep 17 00:00:00 2001 From: wyd621 Date: Mon, 24 Mar 2014 01:25:44 +0000 Subject: [PATCH] * adjust for output timeout from exportConfigVars. --- lib/front/front.class.php | 1 + module/common/view/form.html.php | 2 +- module/common/view/header.lite.html.php | 2 +- www/js/jquery/form/zentao.js | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/front/front.class.php b/lib/front/front.class.php index 10ab0455df..28049a743a 100644 --- a/lib/front/front.class.php +++ b/lib/front/front.class.php @@ -784,6 +784,7 @@ EOT; $jsConfig->submitting = $lang->submitting; $jsConfig->save = $lang->save; $jsConfig->router = $app->server->PHP_SELF; + $jsConfig->timeout = $lang->timeout; $js = self::start(false); $js .= 'var config=' . json_encode($jsConfig); diff --git a/module/common/view/form.html.php b/module/common/view/form.html.php index d810694c14..900ff7f7c5 100755 --- a/module/common/view/form.html.php +++ b/module/common/view/form.html.php @@ -1,5 +1,5 @@ getExtViewFile(__FILE__)){include $extView; return helper::cd();}?> -lang->timeout)?> diff --git a/module/common/view/header.lite.html.php b/module/common/view/header.lite.html.php index b7acfab8e9..0f06fe2c81 100755 --- a/module/common/view/header.lite.html.php +++ b/module/common/view/header.lite.html.php @@ -11,7 +11,7 @@ $clientTheme = $this->app->getClientTheme(); - + zentaoPMS); diff --git a/www/js/jquery/form/zentao.js b/www/js/jquery/form/zentao.js index 4073a109f6..b1481ad3ba 100644 --- a/www/js/jquery/form/zentao.js +++ b/www/js/jquery/form/zentao.js @@ -85,7 +85,7 @@ $.extend( error:function(jqXHR, textStatus, errorThrown) { $.enableForm(formID); - if(textStatus == 'timeout' || textStatus == 'error') return alert(timeout); + if(textStatus == 'timeout' || textStatus == 'error') return alert(config.timeout); alert(jqXHR.responseText + textStatus + errorThrown); } };