diff options
| author | Ted Trask <ttrask01@yahoo.com> | 2011-03-09 09:30:02 +0000 |
|---|---|---|
| committer | Ted Trask <ttrask01@yahoo.com> | 2011-03-09 09:30:02 +0000 |
| commit | 858dc81b617e79590125e8c0ca4596b8c8a00b90 (patch) | |
| tree | 609a7983e04d5316928ea08d796acda1bbe17203 | |
| parent | 780dff36f6b4ca5f6008594056663b76fb3a306c (diff) | |
| download | acf-provisioning-858dc81b617e79590125e8c0ca4596b8c8a00b90.tar.bz2 acf-provisioning-858dc81b617e79590125e8c0ca4596b8c8a00b90.tar.xz | |
Fixed param defaults issue that caused extra database entries
| -rw-r--r-- | provisioning-model.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/provisioning-model.lua b/provisioning-model.lua index 0c29426..58313a7 100644 --- a/provisioning-model.lua +++ b/provisioning-model.lua @@ -1323,7 +1323,7 @@ get_device_params = function(device_id, editable) retval[g.name].type="group" end -- Then, get all of the parameters for this device - 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 ".. + 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, CASE WHEN g2p.value IS NOT NULL THEN g2p.value ELSE p.value END 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).."'" |