diff options
| author | Ted Trask <ttrask01@yahoo.com> | 2011-02-11 09:15:53 +0000 |
|---|---|---|
| committer | Ted Trask <ttrask01@yahoo.com> | 2011-02-11 09:15:53 +0000 |
| commit | 67d3ef70bb1c69bd6caa403e76912201d6162ebb (patch) | |
| tree | 1694cdf145733a0665acd97512ea2273ac6f4395 | |
| parent | 829c9356609b5d7c5640b8359b9a8d907c037c35 (diff) | |
| download | acf-provisioning-67d3ef70bb1c69bd6caa403e76912201d6162ebb.tar.bz2 acf-provisioning-67d3ef70bb1c69bd6caa403e76912201d6162ebb.tar.xz | |
Display the matching param group label when displaying device params
| -rw-r--r-- | provisioning-model.lua | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/provisioning-model.lua b/provisioning-model.lua index c37c30c..e9f493c 100644 --- a/provisioning-model.lua +++ b/provisioning-model.lua @@ -1421,11 +1421,11 @@ get_device_params = function(device_id, editable) -- Loop through the groups and put them into the result for i,g in ipairs(tmp) do retval[g.name] = g - retval[g.name].label = g.label + retval[g.name].label = g.name retval[g.name].type="group" end -- Then, get all of the parameters for this device - sql = "SELECT g.name AS group, p.param_id, p.name, p.type, p.label, p.descr, p.seq, p.regexp, CASE WHEN v.value IS NOT NULL THEN v.value WHEN g2p.value IS NOT NULL THEN g2p.value ELSE p.value END AS value, g2p.value AS default ".. + sql = "SELECT g.name AS group, g.label AS grouplabel, p.param_id, p.name, p.type, p.label, p.descr, p.seq, p.regexp, CASE WHEN v.value IS NOT NULL THEN v.value WHEN g2p.value IS NOT NULL THEN g2p.value ELSE p.value END AS value, g2p.value AS default ".. "FROM (devices_to_classes d2t JOIN provisioning_classes t USING(class_id) JOIN classes_to_param_groups t2g USING (class_id) JOIN provisioning_groups g USING(group_id) ".. "JOIN param_groups_to_params g2p USING(group_id) JOIN provisioning_params p USING(param_id)) LEFT JOIN provisioning_values v ON(d2t.device_id=v.device_id AND p.param_id=v.param_id AND g.name=v.group_name ) ".. "WHERE d2t.device_id='"..escape(device_id).."'" @@ -1444,6 +1444,7 @@ get_device_params = function(device_id, editable) if not retval[p.group].value then retval[p.group].value = {} end + retval[p.group].label = p.grouplabel local value = retval[p.group].value if p.type == "boolean" then p.value = (p.value == "true") |