summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTed Trask <ttrask01@yahoo.com>2012-04-18 01:51:49 +0000
committerTed Trask <ttrask01@yahoo.com>2012-04-18 01:51:49 +0000
commit84bfd38162321c36e30a06865a0437cfaa4fc339 (patch)
tree5d700ce1b3af6617722fa5a81fd7ab2b1c867381
parent091862516c4d4bc80eb741101fcd670ed4009ec7 (diff)
downloadacf-provisioning-84bfd38162321c36e30a06865a0437cfaa4fc339.tar.bz2
acf-provisioning-84bfd38162321c36e30a06865a0437cfaa4fc339.tar.xz
Started work on updating for acf-core-0.15
Removed controllerfunctions library (still needs more work and corresponding work in model) Updated for viewfunctions to htmlviewfunctions
-rw-r--r--provisioning-controller.lua46
-rw-r--r--provisioning-dumpdatabase-html.lsp4
-rw-r--r--provisioning-editclass-html.lsp4
-rw-r--r--provisioning-editclassgroup-html.lsp4
-rw-r--r--provisioning-editdevice-html.lsp4
-rw-r--r--provisioning-editdeviceparams-html.lsp4
-rw-r--r--provisioning-editgroup-html.lsp4
-rw-r--r--provisioning-editoptions-html.lsp4
-rw-r--r--provisioning-editparam-html.lsp4
-rw-r--r--provisioning-edittemplate-html.lsp12
-rw-r--r--provisioning-getclassvalues-html.lsp4
-rw-r--r--provisioning-listclasses-html.lsp6
-rw-r--r--provisioning-listclassgroups-html.lsp6
-rw-r--r--provisioning-listdevices-html.lsp6
-rw-r--r--provisioning-listfiles-html.lsp4
-rw-r--r--provisioning-listgroups-html.lsp6
-rw-r--r--provisioning-listparams-html.lsp6
-rw-r--r--provisioning-listrequests-html.lsp4
-rw-r--r--provisioning-listtemplates-html.lsp6
-rw-r--r--provisioning-searchbyextension-html.lsp4
-rw-r--r--provisioning-searchbymac-html.lsp4
-rw-r--r--provisioning-searchdevices-html.lsp4
22 files changed, 74 insertions, 76 deletions
diff --git a/provisioning-controller.lua b/provisioning-controller.lua
index faa46ee..aa37d46 100644
--- a/provisioning-controller.lua
+++ b/provisioning-controller.lua
@@ -1,7 +1,5 @@
module (..., package.seeall)
-require("controllerfunctions")
-
default_action = "listdevices"
listtemplates = function( self )
@@ -9,11 +7,11 @@ listtemplates = function( self )
end
edittemplate = function( self )
- return controllerfunctions.handle_form(self, function() return self.model.get_template(self.clientdata.filename) end, self.model.update_template, self.clientdata, "Save", "Edit Template", "Template Saved")
+ return self.handle_form(self, function() return self.model.get_template(self.clientdata.filename) end, self.model.update_template, self.clientdata, "Save", "Edit Template", "Template Saved")
end
createtemplate = function( self )
- return controllerfunctions.handle_form(self, function() return self.model.get_template(self.clientdata.filename) end, self.model.create_template, self.clientdata, "Create", "Create Template", "Template Created")
+ return self.handle_form(self, function() return self.model.get_template(self.clientdata.filename) end, self.model.create_template, self.clientdata, "Create", "Create Template", "Template Created")
end
deletetemplate = function( self )
@@ -25,11 +23,11 @@ listclassgroups = function( self )
end
editclassgroup = function( self )
- return controllerfunctions.handle_form(self, function() return self.model.get_class_group(self.clientdata.class_group_id) end, self.model.update_class_group, self.clientdata, "Save", "Edit Class Group", "Class Group Saved")
+ return self.handle_form(self, function() return self.model.get_class_group(self.clientdata.class_group_id) end, self.model.update_class_group, self.clientdata, "Save", "Edit Class Group", "Class Group Saved")
end
createclassgroup = function( self )
- return controllerfunctions.handle_form(self, self.model.get_class_group, self.model.create_class_group, self.clientdata, "Create", "Create Class Group", "Parameter Class Created")
+ return self.handle_form(self, self.model.get_class_group, self.model.create_class_group, self.clientdata, "Create", "Create Class Group", "Parameter Class Created")
end
deleteclassgroup = function( self )
@@ -41,11 +39,11 @@ listclasses = function( self )
end
editclass = function( self )
- return controllerfunctions.handle_form(self, function() return self.model.get_class(self.clientdata.class_id) end, self.model.update_class, self.clientdata, "Save", "Edit Class", "Class Saved")
+ return self.handle_form(self, function() return self.model.get_class(self.clientdata.class_id) end, self.model.update_class, self.clientdata, "Save", "Edit Class", "Class Saved")
end
createclass = function( self )
- return controllerfunctions.handle_form(self, self.model.get_class, self.model.create_class, self.clientdata, "Create", "Create Class", "Class Created")
+ return self.handle_form(self, self.model.get_class, self.model.create_class, self.clientdata, "Create", "Create Class", "Class Created")
end
deleteclass = function( self )
@@ -53,7 +51,7 @@ deleteclass = function( self )
end
getclassvalues = function( self )
- return controllerfunctions.handle_form(self, function() return self.model.get_class_options(self.clientdata.class_id) end, self.model.get_class_values, self.clientdata, "Fetch", "Get Device Values")
+ return self.handle_form(self, function() return self.model.get_class_options(self.clientdata.class_id) end, self.model.get_class_values, self.clientdata, "Fetch", "Get Device Values")
end
listgroups = function( self )
@@ -61,11 +59,11 @@ listgroups = function( self )
end
editgroup = function( self )
- return controllerfunctions.handle_form(self, function() return self.model.get_group(self.clientdata.group_id) end, self.model.update_group, self.clientdata, "Save", "Edit Parameter Group", "Parameter Group Saved")
+ return self.handle_form(self, function() return self.model.get_group(self.clientdata.group_id) end, self.model.update_group, self.clientdata, "Save", "Edit Parameter Group", "Parameter Group Saved")
end
creategroup = function( self )
- return controllerfunctions.handle_form(self, self.model.get_group, self.model.create_group, self.clientdata, "Create", "Create Parameter Group", "Parameter Group Created")
+ return self.handle_form(self, self.model.get_group, self.model.create_group, self.clientdata, "Create", "Create Parameter Group", "Parameter Group Created")
end
deletegroup = function( self )
@@ -77,11 +75,11 @@ listparams = function( self )
end
editparam = function( self )
- return controllerfunctions.handle_form(self, function() return self.model.get_param(self.clientdata.param_id) end, self.model.update_param, self.clientdata, "Save", "Edit Parameter", "Parameter Saved")
+ return self.handle_form(self, function() return self.model.get_param(self.clientdata.param_id) end, self.model.update_param, self.clientdata, "Save", "Edit Parameter", "Parameter Saved")
end
createparam = function( self )
- return controllerfunctions.handle_form(self, self.model.get_param, self.model.create_param, self.clientdata, "Create", "Create Parameter", "Parameter Created")
+ return self.handle_form(self, self.model.get_param, self.model.create_param, self.clientdata, "Create", "Create Parameter", "Parameter Created")
end
deleteparam = function( self )
@@ -93,11 +91,11 @@ listdevices = function( self )
end
editdevice = function( self )
- return controllerfunctions.handle_form(self, function() return self.model.get_device(self.clientdata.device_id) end, self.model.update_device, self.clientdata, "Save", "Edit Device", "Device Saved")
+ return self.handle_form(self, function() return self.model.get_device(self.clientdata.device_id) end, self.model.update_device, self.clientdata, "Save", "Edit Device", "Device Saved")
end
createdevice = function( self )
- local retval = controllerfunctions.handle_form(self, self.model.get_device, self.model.create_device, self.clientdata, "Create", "Create Device", "Device Created")
+ local retval = self.handle_form(self, self.model.get_device, self.model.create_device, self.clientdata, "Create", "Create Device", "Device Created")
if retval.value.device_id.value ~= "" and not retval.errtxt then
-- Successfully created a device, redirect to edit it
self:redirect("editdevice?device_id="..retval.value.device_id.value.."&redir=".. (self.clientdata.redir or "listdevices"))
@@ -106,7 +104,7 @@ createdevice = function( self )
end
duplicatedevice = function( self )
- return controllerfunctions.handle_form(self, function() return self.model.get_device(self.clientdata.device_id) end, self.model.create_device, self.clientdata, "Duplicate", "Duplicate Device", "Duplicate Device Created")
+ return self.handle_form(self, function() return self.model.get_device(self.clientdata.device_id) end, self.model.create_device, self.clientdata, "Duplicate", "Duplicate Device", "Duplicate Device Created")
end
deletedevice = function( self )
@@ -114,23 +112,23 @@ deletedevice = function( self )
end
editdeviceparams = function( self )
- return controllerfunctions.handle_form(self, function() return self.model.get_editable_device_params(self.clientdata.device_id) end, self.model.set_editable_device_params, self.clientdata, "Save", "Edit Device Parameters", "Device Parameters Saved")
+ return self.handle_form(self, function() return self.model.get_editable_device_params(self.clientdata.device_id) end, self.model.set_editable_device_params, self.clientdata, "Save", "Edit Device Parameters", "Device Parameters Saved")
end
overridedeviceparams = function( self )
- return controllerfunctions.handle_form(self, function() return self.model.get_device_params(self.clientdata.device_id) end, self.model.set_device_params, self.clientdata, "Save", "Override Device Parameters", "Device Parameters Saved")
+ return self.handle_form(self, function() return self.model.get_device_params(self.clientdata.device_id) end, self.model.set_device_params, self.clientdata, "Save", "Override Device Parameters", "Device Parameters Saved")
end
getdevicevalues = function( self )
- return controllerfunctions.handle_form(self, self.model.get_search_options, self.model.fetch_device_values, self.clientdata, "Search", "Get Device Values")
+ return self.handle_form(self, self.model.get_search_options, self.model.fetch_device_values, self.clientdata, "Search", "Get Device Values")
end
searchdevices = function( self )
- return controllerfunctions.handle_form(self, self.model.get_search_options, self.model.search_device_values, self.clientdata, "Search", "Search Device Parameters")
+ return self.handle_form(self, self.model.get_search_options, self.model.search_device_values, self.clientdata, "Search", "Search Device Parameters")
end
editoptions = function( self )
- return controllerfunctions.handle_form(self, function() return self.model.get_param_options(self.clientdata.param_id) end, self.model.set_param_options, self.clientdata, "Save", "Edit Parameter Options", "Parameter Options Saved")
+ return self.handle_form(self, function() return self.model.get_param_options(self.clientdata.param_id) end, self.model.set_param_options, self.clientdata, "Save", "Edit Parameter Options", "Parameter Options Saved")
end
listfiles = function( self )
@@ -138,11 +136,11 @@ listfiles = function( self )
end
editfile = function( self )
- return controllerfunctions.handle_form(self, function() return self.model.get_filedetails(self.clientdata.filename) end, self.model.update_filedetails, self.clientdata, "Save", "Edit Script File", "Script File Saved")
+ return self.handle_form(self, function() return self.model.get_filedetails(self.clientdata.filename) end, self.model.update_filedetails, self.clientdata, "Save", "Edit Script File", "Script File Saved")
end
dumpdatabase = function( self )
- return controllerfunctions.handle_form(self, self.model.get_database, self.model.dump_database, self.clientdata, "Submit", "Dump Provisioning Database")
+ return self.handle_form(self, self.model.get_database, self.model.dump_database, self.clientdata, "Submit", "Dump Provisioning Database")
end
getfile = function( self )
@@ -162,7 +160,7 @@ deleterequest = function( self )
end
createdevicefromrequest = function( self )
- local retval = controllerfunctions.handle_form(self, self.model.get_request, self.model.create_from_request, self.clientdata, "Create", "Create Device", "Device Created")
+ local retval = self.handle_form(self, self.model.get_request, self.model.create_from_request, self.clientdata, "Create", "Create Device", "Device Created")
if retval.value.device_id and retval.value.device_id.value ~= "" and not retval.errtxt then
-- Successfully created a device, redirect to edit it
self:redirect("editdevice?device_id="..retval.value.device_id.value.."&redir=".. (self.clientdata.redir or "listdevices"))
diff --git a/provisioning-dumpdatabase-html.lsp b/provisioning-dumpdatabase-html.lsp
index 55001f4..e4c0f1d 100644
--- a/provisioning-dumpdatabase-html.lsp
+++ b/provisioning-dumpdatabase-html.lsp
@@ -1,5 +1,5 @@
<% local form, viewlibrary, page_info = ...
-require("viewfunctions")
+require("htmlviewfunctions")
%>
<% if form.value.data then %>
@@ -14,5 +14,5 @@ require("viewfunctions")
<H1><%= html.html_escape(form.label) %></H1>
<%
form.value.data = nil
- displayform(form, nil, nil, page_info, 2)
+ htmlviewfunctions.displayform(form, nil, nil, page_info, 2)
%>
diff --git a/provisioning-editclass-html.lsp b/provisioning-editclass-html.lsp
index b9a7f5d..43ce1f8 100644
--- a/provisioning-editclass-html.lsp
+++ b/provisioning-editclass-html.lsp
@@ -1,5 +1,5 @@
<% local form, viewlibrary, page_info = ...
-require("viewfunctions")
+require("htmlviewfunctions")
%>
<H1><%= html.html_escape(form.label) %></H1>
@@ -9,5 +9,5 @@ require("viewfunctions")
else
form.value.class_id.type = "hidden"
end
- displayform(form, nil, nil, page_info, 2)
+ htmlviewfunctions.displayform(form, nil, nil, page_info, 2)
%>
diff --git a/provisioning-editclassgroup-html.lsp b/provisioning-editclassgroup-html.lsp
index 77c1145..9991fdd 100644
--- a/provisioning-editclassgroup-html.lsp
+++ b/provisioning-editclassgroup-html.lsp
@@ -1,5 +1,5 @@
<% local form, viewlibrary, page_info = ...
-require("viewfunctions")
+require("htmlviewfunctions")
%>
<H1><%= html.html_escape(form.label) %></H1>
@@ -9,5 +9,5 @@ require("viewfunctions")
else
form.value.class_group_id.type = "hidden"
end
- displayform(form, nil, nil, page_info, 2)
+ htmlviewfunctions.displayform(form, nil, nil, page_info, 2)
%>
diff --git a/provisioning-editdevice-html.lsp b/provisioning-editdevice-html.lsp
index dd39948..fddc888 100644
--- a/provisioning-editdevice-html.lsp
+++ b/provisioning-editdevice-html.lsp
@@ -1,5 +1,5 @@
<% local form, viewlibrary, page_info = ...
-require("viewfunctions")
+require("htmlviewfunctions")
%>
<script type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/jquery-latest.js"></script>
@@ -29,5 +29,5 @@ require("viewfunctions")
else
form.value.device_id.type = "hidden"
end
- displayform(form, nil, nil, page_info, 2)
+ htmlviewfunctions.displayform(form, nil, nil, page_info, 2)
%>
diff --git a/provisioning-editdeviceparams-html.lsp b/provisioning-editdeviceparams-html.lsp
index a773326..e19d419 100644
--- a/provisioning-editdeviceparams-html.lsp
+++ b/provisioning-editdeviceparams-html.lsp
@@ -1,5 +1,5 @@
<% local form, viewlibrary, page_info = ...
-require("viewfunctions")
+require("htmlviewfunctions")
%>
<script type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/jquery-latest.js"></script>
@@ -21,5 +21,5 @@ require("viewfunctions")
<H1><%= html.html_escape(form.label) %></H1>
<%
form.value.device_id.readonly = "true"
- displayform(form, nil, nil, page_info, 2)
+ htmlviewfunctions.displayform(form, nil, nil, page_info, 2)
%>
diff --git a/provisioning-editgroup-html.lsp b/provisioning-editgroup-html.lsp
index b75458c..9b202db 100644
--- a/provisioning-editgroup-html.lsp
+++ b/provisioning-editgroup-html.lsp
@@ -1,5 +1,5 @@
<% local form, viewlibrary, page_info = ...
-require("viewfunctions")
+require("htmlviewfunctions")
%>
<H1><%= html.html_escape(form.label) %></H1>
@@ -9,5 +9,5 @@ require("viewfunctions")
else
form.value.group_id.type = "hidden"
end
- displayform(form, nil, nil, page_info, 2)
+ htmlviewfunctions.displayform(form, nil, nil, page_info, 2)
%>
diff --git a/provisioning-editoptions-html.lsp b/provisioning-editoptions-html.lsp
index 10cf9e5..dcaa68f 100644
--- a/provisioning-editoptions-html.lsp
+++ b/provisioning-editoptions-html.lsp
@@ -1,5 +1,5 @@
<% local form, viewlibrary, page_info = ...
-require("viewfunctions")
+require("htmlviewfunctions")
%>
<H1><%= html.html_escape(form.label) %></H1>
@@ -7,5 +7,5 @@ require("viewfunctions")
form.value.param_id.readonly = "true"
form.value.name.readonly = "true"
form.value.label.readonly = "true"
- displayform(form, nil, nil, page_info, 2)
+ htmlviewfunctions.displayform(form, nil, nil, page_info, 2)
%>
diff --git a/provisioning-editparam-html.lsp b/provisioning-editparam-html.lsp
index e9e8334..96dfe70 100644
--- a/provisioning-editparam-html.lsp
+++ b/provisioning-editparam-html.lsp
@@ -1,5 +1,5 @@
<% local form, viewlibrary, page_info = ...
-require("viewfunctions")
+require("htmlviewfunctions")
%>
<H1><%= html.html_escape(form.label) %></H1>
@@ -9,7 +9,7 @@ require("viewfunctions")
else
form.value.param_id.type = "hidden"
end
- displayform(form, nil, nil, page_info, 2)
+ htmlviewfunctions.displayform(form, nil, nil, page_info, 2)
%>
<% if page_info.action == "editparam" then %>
diff --git a/provisioning-edittemplate-html.lsp b/provisioning-edittemplate-html.lsp
index 8e6d54c..ba02b4d 100644
--- a/provisioning-edittemplate-html.lsp
+++ b/provisioning-edittemplate-html.lsp
@@ -1,17 +1,17 @@
<% local form, viewlibrary, page_info = ... %>
-<% require("viewfunctions") %>
+<% require("htmlviewfunctions") %>
<H1><%= html.html_escape(form.label) %></H1>
<H2>Template Details</H2>
<% form.action = page_info.script .. page_info.prefix .. page_info.controller .. "/" .. page_info.action %>
-<% displayformstart(form) %>
+<% htmlviewfunctions.displayformstart(form) %>
<%
if page_info.action == "edittemplate" then
form.value.filename.readonly = "true"
end
-displayformitem(form.value.filename, "filename")
-displayformitem(form.value.label, "label")
-displayformitem(form.value.seq, "seq")
+htmlviewfunctions.displayformitem(form.value.filename, "filename")
+htmlviewfunctions.displayformitem(form.value.label, "label")
+htmlviewfunctions.displayformitem(form.value.seq, "seq")
%>
</DL>
@@ -23,4 +23,4 @@ displayformitem(form.value.seq, "seq")
<% if form.value.filecontent.errtxt then %><P CLASS='error'><%= string.gsub(html.html_escape(form.value.filecontent.errtxt), "\n", "<BR>") %></P><% end %>
<% if form.value.filecontent.descr then %><P CLASS='descr'><%= string.gsub(html.html_escape(form.value.filecontent.descr), "\n", "<BR>") %></P><% end %>
-<% displayformend(form) %>
+<% htmlviewfunctions.displayformend(form) %>
diff --git a/provisioning-getclassvalues-html.lsp b/provisioning-getclassvalues-html.lsp
index 4f07db1..7dcf42d 100644
--- a/provisioning-getclassvalues-html.lsp
+++ b/provisioning-getclassvalues-html.lsp
@@ -1,5 +1,5 @@
<% local form, viewlibrary, page_info = ...
-require("viewfunctions")
+require("htmlviewfunctions")
%>
<% if form.value.values then %>
@@ -23,5 +23,5 @@ require("viewfunctions")
<%
form.value.values = nil
form.value.label = nil
- displayform(form, nil, nil, page_info, 2)
+ htmlviewfunctions.displayform(form, nil, nil, page_info, 2)
%>
diff --git a/provisioning-listclasses-html.lsp b/provisioning-listclasses-html.lsp
index 3cba085..105e9c6 100644
--- a/provisioning-listclasses-html.lsp
+++ b/provisioning-listclasses-html.lsp
@@ -1,5 +1,5 @@
<% local view, viewlibrary, page_info, session = ...
-require("viewfunctions")
+require("htmlviewfunctions")
%>
<script type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/jquery-latest.js"></script>
@@ -19,8 +19,8 @@ require("viewfunctions")
});
</script>
-<% displaycommandresults({"deleteclass", "editclass"}, session) %>
-<% displaycommandresults({"createclass"}, session, true) %>
+<% htmlviewfunctions.displaycommandresults({"deleteclass", "editclass"}, session) %>
+<% htmlviewfunctions.displaycommandresults({"createclass"}, session, true) %>
<h1>Classes</h1>
<DL>
diff --git a/provisioning-listclassgroups-html.lsp b/provisioning-listclassgroups-html.lsp
index 757e8a1..a1b1ce5 100644
--- a/provisioning-listclassgroups-html.lsp
+++ b/provisioning-listclassgroups-html.lsp
@@ -1,5 +1,5 @@
<% local view, viewlibrary, page_info, session = ...
-require("viewfunctions")
+require("htmlviewfunctions")
%>
<script type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/jquery-latest.js"></script>
@@ -11,8 +11,8 @@ require("viewfunctions")
});
</script>
-<% displaycommandresults({"deleteclassgroup", "editclassgroup"}, session) %>
-<% displaycommandresults({"createclassgroup"}, session, true) %>
+<% htmlviewfunctions.displaycommandresults({"deleteclassgroup", "editclassgroup"}, session) %>
+<% htmlviewfunctions.displaycommandresults({"createclassgroup"}, session, true) %>
<h1>Class Groups</h1>
<DL>
diff --git a/provisioning-listdevices-html.lsp b/provisioning-listdevices-html.lsp
index b203368..75d947c 100644
--- a/provisioning-listdevices-html.lsp
+++ b/provisioning-listdevices-html.lsp
@@ -1,5 +1,5 @@
<% local view, viewlibrary, page_info, session = ...
-require("viewfunctions")
+require("htmlviewfunctions")
%>
<script type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/jquery-latest.js"></script>
@@ -23,8 +23,8 @@ require("viewfunctions")
});
</script>
-<% displaycommandresults({"deletedevice", "editdevice", "editdeviceparams", "overridedeviceparams"}, session) %>
-<% displaycommandresults({"createdevice"}, session, true) %>
+<% htmlviewfunctions.displaycommandresults({"deletedevice", "editdevice", "editdeviceparams", "overridedeviceparams"}, session) %>
+<% htmlviewfunctions.displaycommandresults({"createdevice"}, session, true) %>
<% -- Determine all of the groups
local tmp = {}
diff --git a/provisioning-listfiles-html.lsp b/provisioning-listfiles-html.lsp
index 29bb43e..7d79dd3 100644
--- a/provisioning-listfiles-html.lsp
+++ b/provisioning-listfiles-html.lsp
@@ -1,8 +1,8 @@
<% local view, viewlibrary, page_info, session = ...
-require("viewfunctions")
+require("htmlviewfunctions")
%>
-<% displaycommandresults({"editfile"}, session) %>
+<% htmlviewfunctions.displaycommandresults({"editfile"}, session) %>
<h1>Provisioning Script Files</h1>
<DL><TABLE>
diff --git a/provisioning-listgroups-html.lsp b/provisioning-listgroups-html.lsp
index a3aac8e..d3f51f9 100644
--- a/provisioning-listgroups-html.lsp
+++ b/provisioning-listgroups-html.lsp
@@ -1,5 +1,5 @@
<% local view, viewlibrary, page_info, session = ...
-require("viewfunctions")
+require("htmlviewfunctions")
%>
<script type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/jquery-latest.js"></script>
@@ -11,8 +11,8 @@ require("viewfunctions")
});
</script>
-<% displaycommandresults({"deletegroup", "editgroup"}, session) %>
-<% displaycommandresults({"creategroup"}, session, true) %>
+<% htmlviewfunctions.displaycommandresults({"deletegroup", "editgroup"}, session) %>
+<% htmlviewfunctions.displaycommandresults({"creategroup"}, session, true) %>
<h1>Groups</h1>
<DL>
diff --git a/provisioning-listparams-html.lsp b/provisioning-listparams-html.lsp
index b0fa979..43b7a17 100644
--- a/provisioning-listparams-html.lsp
+++ b/provisioning-listparams-html.lsp
@@ -1,5 +1,5 @@
<% local view, viewlibrary, page_info, session = ...
-require("viewfunctions")
+require("htmlviewfunctions")
%>
<script type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/jquery-latest.js"></script>
@@ -11,8 +11,8 @@ require("viewfunctions")
});
</script>
-<% displaycommandresults({"deleteparam", "editparam"}, session) %>
-<% displaycommandresults({"createparam"}, session, true) %>
+<% htmlviewfunctions.displaycommandresults({"deleteparam", "editparam"}, session) %>
+<% htmlviewfunctions.displaycommandresults({"createparam"}, session, true) %>
<h1>Parameters</h1>
<DL>
diff --git a/provisioning-listrequests-html.lsp b/provisioning-listrequests-html.lsp
index 39b24f7..8e52bd2 100644
--- a/provisioning-listrequests-html.lsp
+++ b/provisioning-listrequests-html.lsp
@@ -1,5 +1,5 @@
<% local view, viewlibrary, page_info, session = ...
-require("viewfunctions")
+require("htmlviewfunctions")
%>
<script type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/jquery-latest.js"></script>
@@ -27,7 +27,7 @@ require("viewfunctions")
});
</script>
-<% displaycommandresults({"deleterequest"}, session) %>
+<% htmlviewfunctions.displaycommandresults({"deleterequest"}, session) %>
<h1>Requests</h1>
<DL>
diff --git a/provisioning-listtemplates-html.lsp b/provisioning-listtemplates-html.lsp
index 52edc6d..a0b079e 100644
--- a/provisioning-listtemplates-html.lsp
+++ b/provisioning-listtemplates-html.lsp
@@ -1,5 +1,5 @@
<% local view, viewlibrary, page_info, session = ...
-require("viewfunctions")
+require("htmlviewfunctions")
%>
<script type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/jquery-latest.js"></script>
@@ -11,8 +11,8 @@ require("viewfunctions")
});
</script>
-<% displaycommandresults({"deletetemplate", "edittemplate"}, session) %>
-<% displaycommandresults({"createtemplate"}, session, true) %>
+<% htmlviewfunctions.displaycommandresults({"deletetemplate", "edittemplate"}, session) %>
+<% htmlviewfunctions.displaycommandresults({"createtemplate"}, session, true) %>
<h1>Templates</h1>
<DL>
diff --git a/provisioning-searchbyextension-html.lsp b/provisioning-searchbyextension-html.lsp
index bf7b8ab..91943fb 100644
--- a/provisioning-searchbyextension-html.lsp
+++ b/provisioning-searchbyextension-html.lsp
@@ -1,5 +1,5 @@
<% local form, viewlibrary, page_info, session = ...
-require("viewfunctions")
+require("htmlviewfunctions")
%>
<script type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/jquery-latest.js"></script>
@@ -16,7 +16,7 @@ require("viewfunctions")
});
</script>
-<% displaycommandresults({"deletedevice", "editdevice", "editdeviceparams", "overridedeviceparams"}, session) %>
+<% htmlviewfunctions.displaycommandresults({"deletedevice", "editdevice", "editdeviceparams", "overridedeviceparams"}, session) %>
<%
if session.searchdevicesresult then
diff --git a/provisioning-searchbymac-html.lsp b/provisioning-searchbymac-html.lsp
index 9e9c73c..038d316 100644
--- a/provisioning-searchbymac-html.lsp
+++ b/provisioning-searchbymac-html.lsp
@@ -1,5 +1,5 @@
<% local form, viewlibrary, page_info, session = ...
-require("viewfunctions")
+require("htmlviewfunctions")
%>
<script type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/jquery-latest.js"></script>
@@ -15,7 +15,7 @@ require("viewfunctions")
});
</script>
-<% displaycommandresults({"deletedevice", "editdevice", "editdeviceparams", "overridedeviceparams"}, session) %>
+<% htmlviewfunctions.displaycommandresults({"deletedevice", "editdevice", "editdeviceparams", "overridedeviceparams"}, session) %>
<%
if session.searchdevicesresult then
diff --git a/provisioning-searchdevices-html.lsp b/provisioning-searchdevices-html.lsp
index cd7ddc3..6c8cc96 100644
--- a/provisioning-searchdevices-html.lsp
+++ b/provisioning-searchdevices-html.lsp
@@ -1,5 +1,5 @@
<% local form, viewlibrary, page_info = ...
-require("viewfunctions")
+require("htmlviewfunctions")
%>
<script type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/jquery-latest.js"></script>
@@ -37,5 +37,5 @@ elseif form.value.result then
<H1><%= html.html_escape(form.label) %></H1>
<%
form.value.result = nil
- displayform(form, nil, nil, page_info, 2)
+ htmlviewfunctions.displayform(form, nil, nil, page_info, 2)
%>