Author: jfthomps
Date: Tue Dec 9 18:07:52 2014
New Revision: 1644137
URL: http://svn.apache.org/r1644137
Log:
(no JIRA)
siteconfig.php: modified AJupdateAllSettings: create new continuation with
updated origvals and send back to client
siteconfig.js: modified generalSiteConfigCB: updated passed in continuation
element with passed in updated continuation
Modified:
vcl/trunk/web/.ht-inc/siteconfig.php
vcl/trunk/web/js/siteconfig.js
Modified: vcl/trunk/web/.ht-inc/siteconfig.php
URL:
http://svn.apache.org/viewvc/vcl/trunk/web/.ht-inc/siteconfig.php?rev=1644137&r1=1644136&r2=1644137&view=diff
==============================================================================
--- vcl/trunk/web/.ht-inc/siteconfig.php (original)
+++ vcl/trunk/web/.ht-inc/siteconfig.php Tue Dec 9 18:07:52 2014
@@ -454,13 +454,21 @@ class TimeVariable {
$newval = $newval * 60;
if($newval != $arr['val'])
$newvals[$arr['key']] = $newval;
+ $origvals[$id]['val'] = $newval;
}
foreach($newvals as $key => $val)
setVariable($key, $val, 'none');
+
+ $cdata = $this->basecdata;
+ $cdata['origvals'] = $origvals;
+ $savecont = addContinuationsEntry('AJupdateAllSettings',
$cdata);
+
$arr = array('status' => 'success',
'msgid' => "{$this->domidbase}msg",
'btn' => "{$this->domidbase}btn",
- 'msg' => $this->updatemsg);
+ 'msg' => $this->updatemsg,
+ 'contid' => "{$this->domidbase}cont",
+ 'savecont' => $savecont);
sendJSON($arr);
}
Modified: vcl/trunk/web/js/siteconfig.js
URL:
http://svn.apache.org/viewvc/vcl/trunk/web/js/siteconfig.js?rev=1644137&r1=1644136&r2=1644137&view=diff
==============================================================================
--- vcl/trunk/web/js/siteconfig.js (original)
+++ vcl/trunk/web/js/siteconfig.js Tue Dec 9 18:07:52 2014
@@ -20,6 +20,7 @@ function generalSiteConfigCB(data, ioArg
dojo.removeClass(data.items.msgid, 'cfgerror');
dojo.addClass(data.items.msgid, 'cfgsuccess');
dojo.byId(data.items.msgid).innerHTML = data.items.msg;
+ dojo.byId(data.items.contid).value = data.items.savecont;
if('btn' in data.items)
dijit.byId(data.items.btn).set('disabled', false);
if('extrafunc' in data.items) {
