Removed unneeded views by updating CFE for autoview

6 files changed, 20 insertions, 58 deletions

diff --git a/dhcp-createhost-html.lsp b/dhcp-createhost-html.lsp
deleted file mode 120000
index 1b2c3b9..0000000
--- a/dhcp-createhost-html.lsp
+++ /dev/null
@@ -1 +0,0 @@
-dhcp-edithost-html.lsp
\ No newline at end of file
diff --git a/dhcp-createsubnet-html.lsp b/dhcp-createsubnet-html.lsp
deleted file mode 120000
index 48378d6..0000000
--- a/dhcp-createsubnet-html.lsp
+++ /dev/null
@@ -1 +0,0 @@
-dhcp-editsubnet-html.lsp
\ No newline at end of file
diff --git a/dhcp-edithost-html.lsp b/dhcp-edithost-html.lsp
deleted file mode 100644
index ce679f2..0000000
--- a/dhcp-edithost-html.lsp
+++ /dev/null
@@ -1,14 +0,0 @@
-<% local form, viewlibrary, page_info = ... 
-require("htmlviewfunctions")
-html = require("acf.html")
-%>
-
-<H1><%= html.html_escape(form.label) %></H1>
-<%
-	form.action = page_info.script .. page_info.prefix .. page_info.controller .. "/" .. page_info.action
-	if page_info.action == "edithost" then
-		form.value.host.readonly = true
-	end
-	local order = {"host", "mac", "ip"}
-	htmlviewfunctions.displayform(form, order)
-%>
diff --git a/dhcp-editsubnet-html.lsp b/dhcp-editsubnet-html.lsp
deleted file mode 100644
index 8654069..0000000
--- a/dhcp-editsubnet-html.lsp
+++ /dev/null
@@ -1,14 +0,0 @@
-<% local form, viewlibrary, page_info = ... 
-require("htmlviewfunctions")
-html = require("acf.html")
-%>
-
-<H1><%= html.html_escape(form.label) %></H1>
-<%
-	form.action = page_info.script .. page_info.prefix .. page_info.controller .. "/" .. page_info.action
-	if page_info.action == "editsubnet" then
-		form.value.subnet.readonly = true
-	end
-	local order = {"subnet", "netmask", "leaserangestart", "leaserangeend", "unknownclients", "domainname", "domainnameservers", "routers", "defleasetime", "maxleasetime"}
-	htmlviewfunctions.displayform(form, order)
-%>
diff --git a/dhcp-model.lua b/dhcp-model.lua
index d26e2ee..f266c8d 100644
--- a/dhcp-model.lua
+++ b/dhcp-model.lua
@@ -411,9 +411,9 @@ end
 
 create_new_host = function()
 	host = { 
-	        host         = cfe({ label="Host Name" }),
-	        mac          = cfe({ label="MAC Address" }),
-	        addresses    = cfe({ label="Fixed Addresses", descr="Comma-separated addresses" }),
+	        host         = cfe({ label="Host Name", seq=1 }),
+	        mac          = cfe({ label="MAC Address", seq=2 }),
+	        addresses    = cfe({ label="Fixed Addresses", descr="Comma-separated addresses", seq=3 }),
 	      }
 	      
 	return cfe({ type="group", value=host, label="Host" })
@@ -424,6 +424,7 @@ host_read = function(self, clientdata)
 	config = config or parseconfigfile(fs.read_file(configfile) or "")
 	local host = create_new_host()
 	host.value.host.value = name
+	host.value.host.readonly = true
 
 	for j,k in ipairs(config) do
 		if k[1] == "host" and k[2] == name then
@@ -525,17 +526,17 @@ end
 
 create_new_subnet = function()
 	net = { 
-	        subnet       = cfe({ label="Subnet" }),
-	        netmask      = cfe({ label="Netmask" }),
-	        defleasetime = cfe({ label="Default Lease Time" }),
-	        maxleasetime = cfe({ label="Maximum Lease Time" }),
-	        routers      = cfe({ label="Routers", descr="Comma-separated addresses" }),
-	        domainname   = cfe({ label="Domainname" }),
-		domainnameservers = cfe({ label="Domain Name Servers", descr="Comma-separated addresses" }),
+	        subnet       = cfe({ label="Subnet", seq=1 }),
+	        netmask      = cfe({ label="Netmask", seq=2 }),
+	        defleasetime = cfe({ label="Default Lease Time", seq=9 }),
+	        maxleasetime = cfe({ label="Maximum Lease Time", seq=10 }),
+	        routers      = cfe({ label="Routers", descr="Comma-separated addresses", seq=8 }),
+	        domainname   = cfe({ label="Domainname", seq=6 }),
+		domainnameservers = cfe({ label="Domain Name Servers", descr="Comma-separated addresses", seq=7 }),
 	        --wpad         = cfe({ label="Web Proxy Auto Discovery" }),
-	        leaserangestart = cfe({ label="Lease Range Start" }),
-	        leaserangeend = cfe({ label="Lease Range End" }),
-	        unknownclients = cfe({ type="select", label="Unknown Clients", option={"", "allow", "deny"} }),
+	        leaserangestart = cfe({ label="Lease Range Start", seq=3 }),
+	        leaserangeend = cfe({ label="Lease Range End", seq=4 }),
+	        unknownclients = cfe({ type="select", label="Unknown Clients", option={"", "allow", "deny"}, seq=5 }),
 	      }
 	      
 	return cfe({ type="group", value=net, label="Subnet" })
@@ -546,6 +547,7 @@ subnet_read = function(self, clientdata)
 	config = config or parseconfigfile(fs.read_file(configfile) or "")
 	local net = create_new_subnet()
 	net.value.subnet.value = name
+	net.value.subnet.readonly = true
 	local pools = 0
 	local ranges = 0
 
@@ -693,11 +695,11 @@ end
 read_settings = function()
 	config = config or parseconfigfile(fs.read_file(configfile) or "")
 	local settings = {}
-	settings.domainname = cfe({ label="Domain Name" })
-	settings.domainnameservers = cfe({ label="Domain Name Servers", descr="Comma-separated addresses" })
-	settings.dnsupdatestyle = cfe({ type="select", label="DNS Update Style", option={"none", "ad-hoc", "interim"} })
-	settings.defleasetime = cfe({ label="Default Lease Time" })
-	settings.maxleasetime = cfe({ label="Maximum Lease Time" })
+	settings.domainname = cfe({ label="Domain Name", seq=1 })
+	settings.domainnameservers = cfe({ label="Domain Name Servers", descr="Comma-separated addresses", seq=2 })
+	settings.dnsupdatestyle = cfe({ type="select", label="DNS Update Style", option={"none", "ad-hoc", "interim"}, seq=3 })
+	settings.defleasetime = cfe({ label="Default Lease Time", seq=4 })
+	settings.maxleasetime = cfe({ label="Maximum Lease Time", seq=5 })
 	for i,value in ipairs(config) do
 		if value[1] == "option" then
 			if value[2] == "domain-name" then
diff --git a/dhcp-settings-html.lsp b/dhcp-settings-html.lsp
deleted file mode 100644
index 5528831..0000000
--- a/dhcp-settings-html.lsp
+++ /dev/null
@@ -1,10 +0,0 @@
-<% local form, viewlibrary, page_info = ... %>
-<% require("htmlviewfunctions") %>
-<% html = require("acf.html") %>
-
-<h1><%= html.html_escape(form.label) %></h1>
-<%
-	form.action = page_info.script .. page_info.prefix .. page_info.controller .. "/" .. page_info.action
-	local order = {"domainname", "domainnameservers", "dnsupdatestyle", "defleasetime", "maxleasetime"}
-	htmlviewfunctions.displayform(form, order)
-%>