diff options
| author | Ted Trask <ttrask01@yahoo.com> | 2010-10-28 14:31:30 +0000 |
|---|---|---|
| committer | Ted Trask <ttrask01@yahoo.com> | 2010-10-28 14:31:30 +0000 |
| commit | 0ae343e0a60d5ff727af3619e6d22309846529ef (patch) | |
| tree | 6f990f0c0eeddc81264f2c5d0596919ca89a7af9 /provisioning-model.lua | |
| parent | 570fd742bb0bcf2b3a0cd51a1222e42e05ac8f77 (diff) | |
| download | acf-provisioning-0ae343e0a60d5ff727af3619e6d22309846529ef.tar.bz2 acf-provisioning-0ae343e0a60d5ff727af3619e6d22309846529ef.tar.xz | |
Allowed blanks for device classes and class groups.
Diffstat (limited to 'provisioning-model.lua')
| -rw-r--r-- | provisioning-model.lua | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/provisioning-model.lua b/provisioning-model.lua index 0142910..9dd45ff 100644 --- a/provisioning-model.lua +++ b/provisioning-model.lua @@ -462,8 +462,7 @@ get_class = function(class_id) tmp = getselectresponse(sql) for i,g in ipairs(tmp) do if not retval.groups.value[g.name] then - -- Use this line to allow blank selection: retval.groups.value[g.name] = cfe({type="select", label=g.name, option={{value="", label=""}}}) - retval.groups.value[g.name] = cfe({type="select", label=g.name, option={}}) + retval.groups.value[g.name] = cfe({type="select", label=g.name, option={{value="", label=""}}}) end local group = retval.groups.value[g.name] group.option[#group.option + 1] = {value=g.group_id, label=g.label} @@ -529,8 +528,10 @@ update_class = function(class, create) end -- Insert the class to group entries for n,g in pairs(class.value.groups.value) do - sql = "INSERT INTO classes_to_param_groups VALUES('"..escape(class.value.class_id.value).."', '"..escape(g.value).."')" - runsqlcommand(sql, true) + if g.value ~= "" then + sql = "INSERT INTO classes_to_param_groups VALUES('"..escape(class.value.class_id.value).."', '"..escape(g.value).."')" + runsqlcommand(sql, true) + end end sql = "COMMIT" @@ -970,8 +971,7 @@ get_device = function(device_id) tmp = getselectresponse(sql) for i,c in ipairs(tmp) do if not retval.classes.value[c.name] then - -- Use this line to allow blank selection: retval.classes.value[c.name] = cfe({type="select", label=c.name, option={{value="", label=""}}}) - retval.classes.value[c.name] = cfe({type="select", label=c.name, option={}}) + retval.classes.value[c.name] = cfe({type="select", label=c.name, option={{value="", label=""}}}) end local class = retval.classes.value[c.name] class.option[#class.option + 1] = {value=c.class_id, label=c.label} @@ -1034,8 +1034,10 @@ update_device = function(device, create) end -- Insert the device to class entries for n,c in pairs(device.value.classes.value) do - sql = "INSERT INTO devices_to_classes VALUES('"..escape(device.value.device_id.value).."', '"..escape(c.value).."')" - runsqlcommand(sql, true) + if c.value ~= "" then + sql = "INSERT INTO devices_to_classes VALUES('"..escape(device.value.device_id.value).."', '"..escape(c.value).."')" + runsqlcommand(sql, true) + end end sql = "COMMIT" |