summaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
authorKaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>2013-09-16 16:05:32 +0300
committerKaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>2013-09-16 16:05:32 +0300
commit5467f2ddadeaaf74dfb2109d53c4d5be9f275f20 (patch)
treef649f50edfefb146f097fd8da39a13dd4e261b84 /web
parentdb136cebdda6f853fdc08a3b4beaeef310a11a22 (diff)
downloadaconf-5467f2ddadeaaf74dfb2109d53c4d5be9f275f20.tar.bz2
aconf-5467f2ddadeaaf74dfb2109d53c4d5be9f275f20.tar.xz
integration with 'lbu commit'
client must specifically request saving files if server's root file system is tmpfs web client does this automatically on commit
Diffstat (limited to 'web')
-rw-r--r--web/client.js18
1 files changed, 14 insertions, 4 deletions
diff --git a/web/client.js b/web/client.js
index fc352c7..17ac45c 100644
--- a/web/client.js
+++ b/web/client.js
@@ -72,7 +72,7 @@ $(function() {
}
- var txnMgr = (function(token) {
+ var txnMgr = (function(token, saveRequired) {
var txn, changed, invalid;
function reset() {
@@ -319,12 +319,19 @@ $(function() {
commit: function() {
var def = $.Deferred();
+ function reject(xhr) { def.reject(xhr); }
request(
"/transaction", {type: "PUT"}
).done(function() {
reset();
- def.resolve();
- }).fail(function(xhr) { def.reject(xhr); });
+ if (saveRequired)
+ request(
+ "/save", {type: "POST"}
+ ).done(function() {
+ def.resolve();
+ }).fail(reject);
+ else def.resolve();
+ }).fail(reject);
return def;
},
@@ -336,7 +343,10 @@ $(function() {
return request("/login", {type: "DELETE"});
}
};
- })(xhr.getResponseHeader("X-ACF-Auth-Token"));
+ })(
+ xhr.getResponseHeader("X-ACF-Auth-Token"),
+ xhr.getResponseHeader("X-ACF-Save-Required") == "1"
+ );