diff options
| author | Ted Trask <ttrask01@yahoo.com> | 2011-02-11 09:01:03 +0000 |
|---|---|---|
| committer | Ted Trask <ttrask01@yahoo.com> | 2011-02-11 09:01:03 +0000 |
| commit | 52cacde2047688a2c184c861c7a7821921bbae52 (patch) | |
| tree | 0b0eaae78b9cfda91c7ee1c853bb4e5a63947c9a /provisioning-model.lua | |
| parent | cf30a7c085eeadec8f7147836eb92f0a36d3bdff (diff) | |
| download | acf-provisioning-52cacde2047688a2c184c861c7a7821921bbae52.tar.bz2 acf-provisioning-52cacde2047688a2c184c861c7a7821921bbae52.tar.xz | |
Fixed up class sequence
Diffstat (limited to 'provisioning-model.lua')
| -rw-r--r-- | provisioning-model.lua | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/provisioning-model.lua b/provisioning-model.lua index 5567ed5..bfdb2da 100644 --- a/provisioning-model.lua +++ b/provisioning-model.lua @@ -677,7 +677,7 @@ list_classes = function() -- Get the classes from the DB local res, err = pcall(function() local connected = databaseconnect() - local sql = "SELECT class_id, g.label AS group, c.label, c.seq FROM provisioning_classes c JOIN provisioning_class_groups g USING(class_group_id) ORDER BY g.seq ASC, g.label ASC, c.label ASC" + local sql = "SELECT class_id, g.label AS group, c.label, c.seq FROM provisioning_classes c JOIN provisioning_class_groups g USING(class_group_id) ORDER BY g.seq ASC, g.label ASC, c.seq ASC, c.label ASC" retval = getselectresponse(sql) if connected then databasedisconnect() end end) @@ -1252,7 +1252,7 @@ get_device = function(device_id) retval.template_id.option[#retval.template_id.option + 1] = {value=t.template_id, label=t.label} end -- Finally, get the class options - sql = "SELECT class_id, g.name, g.label AS group, c.label, c.seq FROM provisioning_classes c JOIN provisioning_class_groups g USING(class_group_id) ORDER BY g.seq ASC, g.label ASC, c.label ASC" + sql = "SELECT class_id, g.name, g.label AS group, c.label, c.seq FROM provisioning_classes c JOIN provisioning_class_groups g USING(class_group_id) ORDER BY g.seq ASC, g.label ASC, c.seq ASC, c.label ASC" tmp = getselectresponse(sql) for i,c in ipairs(tmp) do if not retval.classes.value[c.name] then |