From: Jo-Philipp Wich <jow@openwrt.org>
Date: Mon, 11 Oct 2010 22:55:49 +0000 (+0000)
Subject: libs/cbi: don't run apply on render, this is a quick hack and will be reworked soon
X-Git-Tag: 0.10.0~640
X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=f735ef30bdf397b0b590f89cc5c77e7783232ca5;ds=inline

libs/cbi: don't run apply on render, this is a quick hack and will be reworked soon
---

diff --git a/libs/cbi/luasrc/cbi.lua b/libs/cbi/luasrc/cbi.lua
index fff88a227..8dd16b181 100644
--- 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)
-	end 
+	end
 end
 
 function Node._run_hooks(self, ...)
@@ -356,7 +356,7 @@ end
 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()
@@ -514,7 +514,7 @@ function Delegator.parse(self, ...)
 			return FORM_DONE
 		end
 	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")
-	
+
 	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
@@ -542,11 +542,11 @@ function Delegator.parse(self, ...)
 	elseif stat < FORM_PROCEED then
 		return stat
 	end
-	
+
 
 	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
@@ -1264,7 +1264,7 @@ function AbstractValue.parse(self, section, novld)
 				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