Add bulk HTML action to show available bulk actions

(cherry picked from commit 230c4ab7b9013ff8c44e957794b9495689bb3554)

4 files changed, 22 insertions, 13 deletions

diff --git a/provisioning-bulk-html.lsp b/provisioning-bulk-html.lsp
new file mode 100644
index 0000000..d1278e1
--- /dev/null
+++ b/provisioning-bulk-html.lsp
@@ -0,0 +1,19 @@
+<% local form, viewlibrary, page_info, session = ...
+htmlviewfunctions = require("htmlviewfunctions")
+html = require("acf.html")
+%>
+
+<% if viewlibrary and viewlibrary.dispatch_component then
+	if viewlibrary.check_permission("bulkcreatedevices") then
+		viewlibrary.dispatch_component("bulkcreatedevices")
+	end
+end %>
+
+<%
+	local viewtype = cfe({type="hidden", value="stream"})
+	if viewlibrary.check_permission("bulkdumprawdevices") then
+		htmlviewfunctions.displayitem(cfe({type="form", value={viewtype=viewtype}, label="Bulk Dump Devices", option="Dump", action="bulkdumprawdevices"}), page_info)
+	elseif viewlibrary.check_permission("bulkdumpdevices") then
+		htmlviewfunctions.displayitem(cfe({type="form", value={viewtype=viewtype}, label="Bulk Dump Devices", option="Dump", action="bulkdumpdevices"}), page_info)
+	end
+%>
diff --git a/provisioning-bulkcreatedevices-html.lsp b/provisioning-bulkcreatedevices-html.lsp
index 17907a6..b0a1a66 100644
--- a/provisioning-bulkcreatedevices-html.lsp
+++ b/provisioning-bulkcreatedevices-html.lsp
@@ -1,6 +1,5 @@
 <% local form, viewlibrary, page_info, session = ...
 htmlviewfunctions = require("htmlviewfunctions")
-html = require("acf.html")
 %>
 
 <% htmlviewfunctions.displayitem(form, page_info) %>
@@ -10,12 +9,3 @@ html = require("acf.html")
 	form.value.bulkdevicedata.type="file"
 	htmlviewfunctions.displayitem(form, page_info)
 %>
-
-<%
-	local viewtype = cfe({type="hidden", value="stream"})
-	if viewlibrary.check_permission("bulkdumprawdevices") then
-		htmlviewfunctions.displayitem(cfe({type="form", value={viewtype=viewtype}, label="Bulk Dump Devices", option="Dump", action="bulkdumprawdevices"}), page_info)
-	elseif viewlibrary.check_permission("bulkdumpdevices") then
-		htmlviewfunctions.displayitem(cfe({type="form", value={viewtype=viewtype}, label="Bulk Dump Devices", option="Dump", action="bulkdumpdevices"}), page_info)
-	end
-%>
diff --git a/provisioning.menu b/provisioning.menu
index ae82d51..2a42626 100644
--- a/provisioning.menu
+++ b/provisioning.menu
@@ -4,7 +4,7 @@ Applications	89Provisioning		Extension	searchbyextension
 Applications	89Provisioning		MAC_Address	searchbymac
 Applications	89Provisioning		Search		searchdevices
 Applications	89Provisioning		Create		createdevice
-Applications	89Provisioning		Bulk_Create	bulkcreatedevices
+Applications	89Provisioning		Bulk		bulk
 Applications	89Provisioning		Devices		listdevices
 Applications	89Provisioning		Requests	listrequests
 Applications	89Provisioning		Templates	listtemplates
diff --git a/provisioning.roles b/provisioning.roles
index 17d9aa7..ef59e81 100644
--- a/provisioning.roles
+++ b/provisioning.roles
@@ -1,4 +1,4 @@
-USER=provisioning:searchdevices,provisioning:listdevices,provisioning:viewdeviceparams,provisioning:searchbyextension,provisioning:searchbymac,provisioning:listrequests,provisioning:bulkdumpdevices
+USER=provisioning:searchdevices,provisioning:listdevices,provisioning:viewdeviceparams,provisioning:searchbyextension,provisioning:searchbymac,provisioning:listrequests,provisioning:bulkdumpdevices,provisioning:bulk
 EDITOR=provisioning:editdevice,provisioning:createdevice,provisioning:duplicatedevice,provisioning:deletedevice,provisioning:editdeviceparams,provisioning:deleterequest,provisioning:createdevicefromrequest,provisioning:bulkcreatedevices
 EXPERT=provisioning:listtemplates,provisioning:edittemplate,provisioning:createtemplate,provisioning:deletetemplate,provisioning:listclassgroups,provisioning:editclassgroup,provisioning:createclassgroup,provisioning:deleteclassgroup,provisioning:listclasses,provisioning:editclass,provisioning:createclass,provisioning:deleteclass,provisioning:listgroups,provisioning:editgroup,provisioning:creategroup,provisioning:deletegroup,provisioning:listparams,provisioning:editparam,provisioning:createparam,provisioning:deleteparam,provisioning:overridedeviceparams,provisioning:editoptions,provisioning:listfiles,provisioning:editfile,provisioning:getdevicevalues,provisioning:bulkdumprawdevices
-ADMIN=provisioning:listtemplates,provisioning:edittemplate,provisioning:createtemplate,provisioning:deletetemplate,provisioning:searchdevices,provisioning:listdevices,provisioning:editdevice,provisioning:createdevice,provisioning:duplicatedevice,provisioning:deletedevice,provisioning:listclassgroups,provisioning:editclassgroup,provisioning:createclassgroup,provisioning:deleteclassgroup,provisioning:listclasses,provisioning:editclass,provisioning:createclass,provisioning:deleteclass,provisioning:listgroups,provisioning:editgroup,provisioning:creategroup,provisioning:deletegroup,provisioning:listparams,provisioning:editparam,provisioning:createparam,provisioning:deleteparam,provisioning:editdeviceparams,provisioning:overridedeviceparams,provisioning:viewdeviceparams,provisioning:editoptions,provisioning:listfiles,provisioning:editfile,provisioning:searchbyextension,provisioning:searchbymac,provisioning:getdevicevalues,provisioning:dumpdatabase,provisioning:getclassvalues,provisioning:listrequests,provisioning:deleterequest,provisioning:createdevicefromrequest,provisioning:bulkcreatedevices,provisioning:bulkdumprawdevices
+ADMIN=provisioning:listtemplates,provisioning:edittemplate,provisioning:createtemplate,provisioning:deletetemplate,provisioning:searchdevices,provisioning:listdevices,provisioning:editdevice,provisioning:createdevice,provisioning:duplicatedevice,provisioning:deletedevice,provisioning:listclassgroups,provisioning:editclassgroup,provisioning:createclassgroup,provisioning:deleteclassgroup,provisioning:listclasses,provisioning:editclass,provisioning:createclass,provisioning:deleteclass,provisioning:listgroups,provisioning:editgroup,provisioning:creategroup,provisioning:deletegroup,provisioning:listparams,provisioning:editparam,provisioning:createparam,provisioning:deleteparam,provisioning:editdeviceparams,provisioning:overridedeviceparams,provisioning:viewdeviceparams,provisioning:editoptions,provisioning:listfiles,provisioning:editfile,provisioning:searchbyextension,provisioning:searchbymac,provisioning:getdevicevalues,provisioning:dumpdatabase,provisioning:getclassvalues,provisioning:listrequests,provisioning:deleterequest,provisioning:createdevicefromrequest,provisioning:bulkcreatedevices,provisioning:bulkdumprawdevices,provisioning:bulk