diff options
-rw-r--r-- | provisioning-listclasses-html.lsp | 2 | ||||
-rw-r--r-- | provisioning-model.lua | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/provisioning-listclasses-html.lsp b/provisioning-listclasses-html.lsp index 5aa8a13..d5550c7 100644 --- a/provisioning-listclasses-html.lsp +++ b/provisioning-listclasses-html.lsp @@ -21,6 +21,7 @@ require("viewfunctions") <TH>Action</TH> <TH>Class Group</TH> <TH>Label</TH> + <TH>Sequence</TH> </TR> </THEAD><TBODY> <% for k,v in ipairs( view.value ) do %> @@ -35,6 +36,7 @@ require("viewfunctions") </TD> <TD><%= html.html_escape(v.group) %></TD> <TD><%= html.html_escape(v.label) %></TD> + <TD><%= html.html_escape(v.seq) %></TD> </TR> <% end %> </TBODY> 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 |