diff options
| author | Ted Trask <ttrask01@yahoo.com> | 2011-12-08 22:01:14 +0000 |
|---|---|---|
| committer | Ted Trask <ttrask01@yahoo.com> | 2011-12-08 22:01:14 +0000 |
| commit | 9501c604ff64009ca903f04a062f98a8e8f7bd97 (patch) | |
| tree | 3e4c55b06f419ac5dead13a9fc4fc75695fb85ca /provisioning-model.lua | |
| parent | 69f5f5ed87ada28942ddfe0eaaaf3700a0cff7dc (diff) | |
| download | acf-provisioning-9501c604ff64009ca903f04a062f98a8e8f7bd97.tar.bz2 acf-provisioning-9501c604ff64009ca903f04a062f98a8e8f7bd97.tar.xz | |
Removed the default table from param_groups cfe and just use value != default to determine whether or not to save
Diffstat (limited to 'provisioning-model.lua')
| -rw-r--r-- | provisioning-model.lua | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/provisioning-model.lua b/provisioning-model.lua index 2c3ccb7..cd4b058 100644 --- a/provisioning-model.lua +++ b/provisioning-model.lua @@ -836,7 +836,6 @@ get_group = function(group_id) retval.seq = cfe({label="Sequence", seq=4}) retval.params = cfe({type="multi", value={}, label="Parameters", option={}, descr="Each selected parameter will be included in the group", seq=5}) retval.editable = cfe({type="multi", value={}, label="Editable Parameters", option={}, descr="Each selected parameter will be user editable", seq=6}) - retval.default = cfe({type="multi", value={}, label="Parameters with defaults", option={}, descr="Each selected parameter will be have a default value for this group", seq=7}) retval.defaults = cfe({type="group", value={}, label="Parameter Defaults", seq=8}) local errtxt local res, err = pcall(function() @@ -847,7 +846,6 @@ get_group = function(group_id) for i,p in ipairs(tmp) do retval.params.option[#retval.params.option + 1] = {value=p.param_id, label=p.label} retval.editable.option[#retval.editable.option + 1] = {value=p.param_id, label=p.label} - retval.default.option[#retval.default.option + 1] = {value=p.param_id, label=p.label} p.seq = i if p.type == "select" then sql = "SELECT * FROM provisioning_options WHERE param_id='"..escape(p.param_id).."' ORDER BY seq ASC" @@ -878,7 +876,6 @@ get_group = function(group_id) retval.editable.value[#retval.editable.value + 1] = p.param_id end if p.value then - retval.default.value[#retval.default.value + 1] = p.param_id if retval.defaults.value[p.param_id].type == "boolean" then retval.defaults.value[p.param_id].value = (p.value == "true") else @@ -906,7 +903,6 @@ update_group = function(group, create) -- Validate the settings success = modelfunctions.validatemulti(group.value.params) and success success = modelfunctions.validatemulti(group.value.editable) and success - success = modelfunctions.validatemulti(group.value.default) and success if group.value.name.value == "" then success = false group.value.name.errtxt = "Cannot be blank" @@ -958,19 +954,15 @@ update_group = function(group, create) sql = "DELETE FROM param_groups_to_params WHERE group_id='"..escape(group.value.group_id.value).."'" runsqlcommand(sql, true) end - -- Reverse the editable and default table for ease of use below + -- Reverse the editable table for ease of use below local reverseeditable = {} for i,p in ipairs(group.value.editable.value) do reverseeditable[p] = i end - local reversedefault = {} - for i,p in ipairs(group.value.default.value) do - reversedefault[p] = i - end -- Insert the group to param entries for i,p in ipairs(group.value.params.value) do sql = "INSERT INTO param_groups_to_params VALUES('"..escape(group.value.group_id.value).."', '"..escape(p).."', " - if reversedefault[p] then + if group.value.defaults.value[p].value ~= group.value.defaults.value[p].default then sql = sql.."'"..escape(tostring(group.value.defaults.value[p].value)).."'" else sql = sql.."null" |