From 858dc81b617e79590125e8c0ca4596b8c8a00b90 Mon Sep 17 00:00:00 2001 From: Ted Trask Date: Wed, 9 Mar 2011 09:30:02 +0000 Subject: Fixed param defaults issue that caused extra database entries --- provisioning-model.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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).."'" -- cgit v1.2.3