projects
/
project
/
luci.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
2c22ea7
)
libs/cbi: don't run apply on render, this is a quick hack and will be reworked soon
author
Jo-Philipp Wich
<jow@openwrt.org>
Mon, 11 Oct 2010 22:55:49 +0000
(22:55 +0000)
committer
Jo-Philipp Wich
<jow@openwrt.org>
Mon, 11 Oct 2010 22:55:49 +0000
(22:55 +0000)
libs/cbi/luasrc/cbi.lua
patch
|
blob
|
history
diff --git
a/libs/cbi/luasrc/cbi.lua
b/libs/cbi/luasrc/cbi.lua
index
fff88a2
..
8dd16b1
100644
(file)
--- a/
libs/cbi/luasrc/cbi.lua
+++ b/
libs/cbi/luasrc/cbi.lua
@@
-165,7
+165,7
@@
end
function Node._run_hook(self, hook)
if type(self[hook]) == "function" then
return self[hook](self)
function Node._run_hook(self, hook)
if type(self[hook]) == "function" then
return self[hook](self)
- end
+ end
end
function Node._run_hooks(self, ...)
end
function Node._run_hooks(self, ...)
@@
-356,7
+356,7
@@
end
function Map.render(self, ...)
self:_run_hooks("on_init")
Node.render(self, ...)
function Map.render(self, ...)
self:_run_hooks("on_init")
Node.render(self, ...)
- if self._apply then
+ if
false and
self._apply then
local fp = self._apply()
fp:read("*a")
fp:close()
local fp = self._apply()
fp:read("*a")
fp:close()
@@
-514,7
+514,7
@@
function Delegator.parse(self, ...)
return FORM_DONE
end
end
return FORM_DONE
end
end
-
+
if not Map.formvalue(self, "cbi.delg.current") then
self:_run_hooks("on_init")
end
if not Map.formvalue(self, "cbi.delg.current") then
self:_run_hooks("on_init")
end
@@
-524,11
+524,11
@@
function Delegator.parse(self, ...)
self.current = self.current or self:get_active()
self.active = self.active or self:get(self.current)
assert(self.active, "Invalid state")
self.current = self.current or self:get_active()
self.active = self.active or self:get(self.current)
assert(self.active, "Invalid state")
-
+
local stat = FORM_DONE
if type(self.active) ~= "function" then
self.active:populate_delegator(self)
local stat = FORM_DONE
if type(self.active) ~= "function" then
self.active:populate_delegator(self)
- stat = self.active:parse()
+ stat = self.active:parse()
else
self:active()
end
else
self:active()
end
@@
-542,11
+542,11
@@
function Delegator.parse(self, ...)
elseif stat < FORM_PROCEED then
return stat
end
elseif stat < FORM_PROCEED then
return stat
end
-
+
if not Map.formvalue(self, "cbi.submit") then
return FORM_NODATA
if not Map.formvalue(self, "cbi.submit") then
return FORM_NODATA
- elseif stat > FORM_PROCEED
+ elseif stat > FORM_PROCEED
and (not newcurrent or not self:get(newcurrent)) then
return self:_run_hook("on_done") or FORM_DONE
else
and (not newcurrent or not self:get(newcurrent)) then
return self:_run_hook("on_done") or FORM_DONE
else
@@
-1264,7
+1264,7
@@
function AbstractValue.parse(self, section, novld)
table.insert(self.section.error[section], "invalid")
else
self.section.error = {[section] = {"invalid"}}
table.insert(self.section.error[section], "invalid")
else
self.section.error = {[section] = {"invalid"}}
- end
+ end
self.map.save = false
end
if fvalue and not (fvalue == cvalue) then
self.map.save = false
end
if fvalue and not (fvalue == cvalue) then