summaryrefslogtreecommitdiffstats
path: root/provisioning-model.lua
diff options
context:
space:
mode:
authorTed Trask <ttrask01@yahoo.com>2015-12-25 17:08:42 +0000
committerTed Trask <ttrask01@yahoo.com>2015-12-25 17:08:42 +0000
commitda77aa6295d0e36a3af4142c96f496641b459df6 (patch)
treef80b7c6b3e4ed928e02d13a3c135aff198732e9a /provisioning-model.lua
parentb213122428e7126f280d0a83cbda152921e812c4 (diff)
downloadacf-provisioning-da77aa6295d0e36a3af4142c96f496641b459df6.tar.bz2
acf-provisioning-da77aa6295d0e36a3af4142c96f496641b459df6.tar.xz
Fix checkgroupdefaultoverride bug in sql returning false positive
Diffstat (limited to 'provisioning-model.lua')
-rw-r--r--provisioning-model.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/provisioning-model.lua b/provisioning-model.lua
index 8388210..5c8312e 100644
--- a/provisioning-model.lua
+++ b/provisioning-model.lua
@@ -306,8 +306,8 @@ end
local checkgroupdefaultoverride = function(device_id)
sql = "SELECT p.param_id "..
- "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) JOIN provisioning_values v USING(param_id))"..
+ "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) 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='"..provdb.escape(device_id).."' AND v.value IS NOT NULL AND g2p.value IS NOT NULL AND v.value!=g2p.value"
local tmp = getselectresponse(sql)
return (#tmp ~= 0)