summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTed Trask <ttrask01@yahoo.com>2014-11-03 19:54:19 +0000
committerTed Trask <ttrask01@yahoo.com>2014-11-03 19:54:19 +0000
commitca7e4a649ddfc44a7c621f4a95acee25fcfce875 (patch)
treeaacd1a986409fd9fc5ab14995179327d2dcc5602
parentf72b6ace68912bf10d8de87eb6180c8693fe2e45 (diff)
downloadacf-core-ca7e4a649ddfc44a7c621f4a95acee25fcfce875.tar.bz2
acf-core-ca7e4a649ddfc44a7c621f4a95acee25fcfce875.tar.xz
Modify handle_clientdata to not update readonly values
-rw-r--r--app/acf_cli-controller.lua2
-rw-r--r--app/acf_www-controller.lua2
-rwxr-xr-xlua/mvc.lua2
3 files changed, 5 insertions, 1 deletions
diff --git a/app/acf_cli-controller.lua b/app/acf_cli-controller.lua
index 7b706c3..14badd9 100644
--- a/app/acf_cli-controller.lua
+++ b/app/acf_cli-controller.lua
@@ -36,6 +36,8 @@ mymodule.handle_clientdata = function(form, clientdata, group)
if group then name = group.."."..name end
if value.type == "group" then
mymodule.handle_clientdata(value, clientdata, name)
+ elseif value.readonly then
+ -- Don't update readonly values
-- Don't update from the default unless a value exists
elseif value.type == "boolean" and clientdata[name] then
value.value = (clientdata[name] == "true")
diff --git a/app/acf_www-controller.lua b/app/acf_www-controller.lua
index fac4cff..b16a8aa 100644
--- a/app/acf_www-controller.lua
+++ b/app/acf_www-controller.lua
@@ -612,6 +612,8 @@ mymodule.handle_clientdata = function(form, clientdata)
end
if value.type == "group" then
mymodule.handle_clientdata(value, clientdata[name])
+ elseif value.readonly then
+ -- Don't update readonly values
elseif value.type == "boolean" then
--- HTML forms simply don't include checkboxes unless they're checked
value.value = (clientdata[name] ~= nil) and (clientdata[name] ~= "false")
diff --git a/lua/mvc.lua b/lua/mvc.lua
index 8735942..ea1037e 100755
--- a/lua/mvc.lua
+++ b/lua/mvc.lua
@@ -437,7 +437,7 @@ mymodule.handle_clientdata = function(form, clientdata)
value.errtxt = nil
if value.type == "group" then
mymodule.handle_clientdata(value, clientdata[name])
- else
+ elseif not value.readonly then
value.value = clientdata[name] or value.value
end
end