Removed skins/read action and use skins/update instead

6 files changed, 7 insertions, 38 deletions

diff --git a/app/acf-util/acf-util.roles b/app/acf-util/acf-util.roles
index 8741022..99daf79 100644
--- a/app/acf-util/acf-util.roles
+++ b/app/acf-util/acf-util.roles
@@ -1,4 +1,4 @@
 GUEST=logon/logon,logon/logoff,logon/status,welcome/read
 USER=password/editme,roles/read
 EXPERT=
-ADMIN=logon/logon,logon/logoff,logon/status,password/editme,password/status,password/edituser,password/newuser,password/deleteuser,roles/read,roles/getpermslist,roles/viewuserroles,roles/viewroleperms,roles/viewroles,roles/editrole,roles/deleterole,roles/newrole,welcome/read,password/status,password/edituser,password/newuser,password/deleteuser,roles/getpermslist,roles/viewuserroles,roles/viewroleperms,roles/viewroles,roles/editrole,roles/deleterole,roles/newrole,skins/read,skins/update
+ADMIN=logon/logon,logon/logoff,logon/status,password/editme,password/status,password/edituser,password/newuser,password/deleteuser,roles/read,roles/getpermslist,roles/viewuserroles,roles/viewroleperms,roles/viewroles,roles/editrole,roles/deleterole,roles/newrole,welcome/read,password/status,password/edituser,password/newuser,password/deleteuser,roles/getpermslist,roles/viewuserroles,roles/viewroleperms,roles/viewroles,roles/editrole,roles/deleterole,roles/newrole,skins/update
diff --git a/app/acf-util/password-model.lua b/app/acf-util/password-model.lua
index 5a389a8..41236df 100644
--- a/app/acf-util/password-model.lua
+++ b/app/acf-util/password-model.lua
@@ -123,10 +123,10 @@ function mymodule.read_user(self, user)
 	if not avail_skins then
 		avail_skins = {""}
 		local contrl = self:new("acf-util/skins")
-		skins = contrl:read()
+		skins = contrl:update()
 		contrl:destroy()
-		for i,s in ipairs(skins.value) do
-			avail_skins[#avail_skins + 1] = s.value
+		for i,s in ipairs(skins.value.skin.option) do
+			avail_skins[#avail_skins + 1] = s.value or s
 		end
 	end
 
diff --git a/app/acf-util/skins-controller.lua b/app/acf-util/skins-controller.lua
index e6f8fc3..1bceab2 100644
--- a/app/acf-util/skins-controller.lua
+++ b/app/acf-util/skins-controller.lua
@@ -1,12 +1,7 @@
 local mymodule = {}
 
 -- Public methods
-
-mymodule.default_action = "read"
-
-mymodule.read = function (self )
-	return self.model.get(self)
-end
+mymodule.default_action = "update"
 
 mymodule.update = function (self )
 	return self.handle_form(self, self.model.get_update, self.model.update, self.clientdata, "Update", "Update Skin", "Skin updated")
diff --git a/app/acf-util/skins-model.lua b/app/acf-util/skins-model.lua
index 9016e62..8ef41b9 100644
--- a/app/acf-util/skins-model.lua
+++ b/app/acf-util/skins-model.lua
@@ -20,21 +20,13 @@ local function list_skins(self)
 		for i,file in ipairs(posix.dir(self.conf.wwwdir ..skin) or {}) do
 			-- Ignore files that begins with a '.' and 'cgi-bin' and only list folders
 			if not ((string.match(file, "^%.")) or (string.match(file, "^cgi[-]bin")) or (string.match(file, "^static")) or (posix.stat(self.conf.wwwdir .. skin .. file).type ~= "directory")) then
-				local entry = cfe({ value=skin..file, label=file })
-				local current = self.conf.skin
-				entry.inuse = (skin..file == current)
-				table.insert(skinarray, entry)
+				table.insert(skinarray, skin..file)
 			end
 		end
 	end
 	return skinarray
 end
 
-
-mymodule.get = function (self)
-	return cfe({ type="list", value=list_skins(self), label="Skins" })
-end
-
 mymodule.get_update = function (self)
 	local skin = cfe({ type="select", value="", label="Skin", option=list_skins(self) })
 	if self and self.conf and self.conf.skin then
diff --git a/app/acf-util/skins-read-html.lsp b/app/acf-util/skins-read-html.lsp
deleted file mode 100644
index c2e0456..0000000
--- a/app/acf-util/skins-read-html.lsp
+++ /dev/null
@@ -1,18 +0,0 @@
-<% local view, viewlibrary, page_info, session = ... %>
-<% htmlviewfunctions = require("htmlviewfunctions") %>
-<% html = require("acf.html") %>
-
-<% htmlviewfunctions.displaycommandresults({"update"}, session) %>
-
-<h1>Available skins</h1>
-
-<% for i,skin in ipairs(view.value) do %>
-	<div class='item'><p class='left'><%= html.html_escape(skin.value) %></p>
-	<div class='right'>
-	<% if (skin.inuse) then %>
-		in use
-	<% else %>
-		[<a href="update?skin=<%= html.html_escape(skin.value) %>&submit=true">use this skin</a>]
-	<% end %>
-	</div></div><!-- end .item -->
-<% end %>
diff --git a/app/acf-util/skins.menu b/app/acf-util/skins.menu
index bd98be6..6ece8ed 100644
--- a/app/acf-util/skins.menu
+++ b/app/acf-util/skins.menu
@@ -1,2 +1,2 @@
 #CAT  		GROUP/DESC		TAB		ACTION
-System		98Skins			Status		read
+System		98Skins			Status		update