diff options
| author | Jo-Philipp Wich <jo@mein.io> | 2018-05-18 16:44:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-18 16:44:33 +0200 |
| commit | 828202ef5237f48e6f53d15ca198e2c6815b7cd7 (patch) | |
| tree | a59276e5df1ebe77edca65b06b2a3b72f10ba70c /modules/luci-base/luasrc/dispatcher.lua | |
| parent | 80cb4fef8c7db0dadc373fef122d7abb092a7191 (diff) | |
| parent | 9f796fad3a0cc89df57d4e27ef6d7223a093071c (diff) | |
Merge pull request #1769 from jow-/master
UCI apply/rollback workflow
Diffstat (limited to 'modules/luci-base/luasrc/dispatcher.lua')
| -rw-r--r-- | modules/luci-base/luasrc/dispatcher.lua | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/modules/luci-base/luasrc/dispatcher.lua b/modules/luci-base/luasrc/dispatcher.lua index 38932afae..45e1e308f 100644 --- a/modules/luci-base/luasrc/dispatcher.lua +++ b/modules/luci-base/luasrc/dispatcher.lua @@ -182,6 +182,7 @@ local function session_retrieve(sid, allowed_users) (not allowed_users or util.contains(allowed_users, sdat.values.username)) then + uci:set_session_id(sid) return sid, sdat.values end @@ -884,6 +885,8 @@ local function _cbi(self, ...) local pageaction = true local parsechain = { } + local is_rollback, time_remaining = uci:rollback_pending() + for i, res in ipairs(maps) do if res.apply_needed and res.parsechain then local c @@ -911,6 +914,7 @@ local function _cbi(self, ...) res:render({ firstmap = (i == 1), applymap = applymap, + confirmmap = (is_rollback and time_remaining or nil), redirect = redirect, messages = messages, pageaction = pageaction, |