From cf61270b72ebf40bf3eae879073c190a8e5dddb2 Mon Sep 17 00:00:00 2001
From: Ted Trask <ttrask01@yahoo.com>
Date: Fri, 24 Oct 2008 15:20:36 +0000
Subject: Minor change to roles code and major change to roles.  Replaced ALL,
 CREATE, READ, UPDATE, and DELETE with GUEST, USER, EDITOR, EXPERT, and ADMIN.
  Changed all roles files and modified some html files to hide options without
 permissions.  Determine default roles from roles files, rather than
 hard-coded, and added ability to modify default roles by adding permissions.

git-svn-id: svn://svn.alpinelinux.org/acf/devtools/trunk@1563 ab2d0c66-481e-0410-8bed-d214d4d58bed
---
 acfupdate-html.lsp | 34 ++++++++++++++++++----------------
 acfupdate.roles    |  5 +++--
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/acfupdate-html.lsp b/acfupdate-html.lsp
index df7556d..b612f6d 100644
--- a/acfupdate-html.lsp
+++ b/acfupdate-html.lsp
@@ -2,22 +2,7 @@
 require("viewfunctions")
 %>
 
-<% displaycommandresults({"install"}, session) %>
-
-<H1>System Info</H1>
-<DL>
-<%
-displayitem(data.value.version)
-if data.value.version and data.value.version.errtxt and session.permissions.apk and session.permissions.apk.install then
-%>
-	<a href="<%= page_info.script %>/apk-tools/apk/install?package=<%= data.value.version.name %>&redir=<%= page_info.orig_action %>">Install</a>
-<%
-end
-displayitem(data.value.repository)
-%>
-</DL>
-
-<% displaycommandresults({"log"}, session) %>
+<% displaycommandresults({"install", "log"}, session) %>
 
 <%
 	local cmdresult = {}
@@ -41,6 +26,19 @@ displayitem(data.value.repository)
 	end
 %>
 
+<H1>System Info</H1>
+<DL>
+<%
+displayitem(data.value.version)
+if data.value.version and data.value.version.errtxt and session.permissions.apk and session.permissions.apk.install then
+%>
+	<a href="<%= page_info.script %>/apk-tools/apk/install?package=<%= data.value.version.name %>&redir=<%= page_info.orig_action %>">Install</a>
+<%
+end
+displayitem(data.value.repository)
+%>
+</DL>
+
 <% if not data.value.repository.errtxt then %>
 <H1>Actions</H1>
 <DL>
@@ -51,6 +49,7 @@ displayitem(data.value.repository)
 <input type=submit class=submit value="View Status">
 </form>
 </DD>
+<% if session.permissions.acfupdate.diff then %>
 <DT>View Diff</DT> 
 <DD>
 <form action="<%= page_info.script .. page_info.prefix .. page_info.controller .. "/diff" %>" method="POST">
@@ -58,6 +57,7 @@ displayitem(data.value.repository)
 <input type=submit class=submit value="View Diff">
 </form>
 </DD>
+<% end %>
 <DT>View Log</DT>
 <DD>
 <form action="<%= page_info.script .. page_info.prefix .. page_info.controller .. "/log" %>" method="POST">
@@ -65,6 +65,7 @@ displayitem(data.value.repository)
 <input type=submit class=submit value="View Log">
 </form>
 </DD>
+<% if session.permissions.acfupdate.update then %>
 <DT>Update</DT> 
 <DD>
 <form action="<%= page_info.script .. page_info.prefix .. page_info.controller .. "/update" %>" method="POST">
@@ -72,5 +73,6 @@ displayitem(data.value.repository)
 <input type=submit class=submit value="Update">
 </form>
 </DD>
+<% end %>
 </DL>
 <% end %>
diff --git a/acfupdate.roles b/acfupdate.roles
index 935537a..ffdca4d 100644
--- a/acfupdate.roles
+++ b/acfupdate.roles
@@ -1,2 +1,3 @@
-READ=acfupdate:read,acfupdate:status,acfupdate:log
-UPDATE=acfupdate:update,acfupdate:diff
+USER=acfupdate:read,acfupdate:status,acfupdate:log
+EDITOR=acfupdate:update,acfupdate:diff
+ADMIN=acfupdate:read,acfupdate:status,acfupdate:log,acfupdate:update,acfupdate:diff
-- 
cgit v1.2.3