summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTed Trask <ttrask01@yahoo.com>2008-10-24 15:20:36 +0000
committerTed Trask <ttrask01@yahoo.com>2008-10-24 15:20:36 +0000
commit92e263673fdb580cdda70b335c5ff20c66baaf35 (patch)
tree0993732f440da5b19961e5be49c6995b3e5cb194
parent5ec5d4e81a8a39bea0e09e77b88ffc9e9460c96c (diff)
downloadacf-apk-tools-92e263673fdb580cdda70b335c5ff20c66baaf35.tar.bz2
acf-apk-tools-92e263673fdb580cdda70b335c5ff20c66baaf35.tar.xz
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/apk-tools/trunk@1563 ab2d0c66-481e-0410-8bed-d214d4d58bed
-rw-r--r--apk-html.lsp8
-rw-r--r--apk.roles5
2 files changed, 12 insertions, 1 deletions
diff --git a/apk-html.lsp b/apk-html.lsp
index b560aea..4b5a340 100644
--- a/apk-html.lsp
+++ b/apk-html.lsp
@@ -15,7 +15,9 @@ io.write("</span>")
<DL>
<TABLE>
<TR style="background:#eee;font-weight:bold;">
+ <% if session.permissions.apk.delete then %>
<TD style="padding-right:20px;white-space:nowrap;" class="header">Delete</TD>
+ <% end %>
<TD style="padding-right:20px;white-space:nowrap;" class="header">Package Name</TD>
<TD style="padding-right:20px;white-space:nowrap;" class="header">Version</TD>
<TD style="white-space:nowrap;" class="header">Description</TD>
@@ -23,9 +25,11 @@ io.write("</span>")
<% for i,packagetable in pairs(form.value.loaded.value) do %>
<TR>
+ <% if session.permissions.apk.delete then %>
<TD style="padding-right:20px;white-space:nowrap;">
<%= html.link{value = "delete?package=" .. packagetable.name, label="Delete"} %>
</TD>
+ <% end %>
<TD><%= packagetable.name %></TD>
<TD><%= packagetable.version %></TD>
<TD><%= packagetable.description %></TD>
@@ -40,16 +44,20 @@ io.write("</span>")
<DL>
<TABLE>
<TR style="background:#eee;font-weight:bold;">
+ <% if session.permissions.apk.install then %>
<TD style="padding-right:20px;white-space:nowrap;" class="header">Install</TD>
+ <% end %>
<TD style="padding-right:20px;white-space:nowrap;" class="header">Package Name</TD>
<TD style="white-space:nowrap;" WIDTH="90%" class="header">Version</TD>
</TR>
<% for i,packagetable in pairs(form.value.available.value) do %>
<TR>
+ <% if session.permissions.apk.install then %>
<TD style="padding-right:20px;white-space:nowrap;">
<%= html.link{value = "install?package=" .. packagetable.name, label="Install"} %>
</TD>
+ <% end %>
<TD><%= packagetable.name %></TD>
<TD><%= packagetable.version %></TD>
</TR>
diff --git a/apk.roles b/apk.roles
index 1d36adf..64369ef 100644
--- a/apk.roles
+++ b/apk.roles
@@ -1 +1,4 @@
-UPDATE=apk:loaded,apk:available,apk:delete,apk:install,apk:config
+USER=apk:loaded,apk:available
+EDITOR=apk:config
+EXPERT=apk:delete,apk:install
+ADMIN=apk:loaded,apk:available,apk:config,apk:delete,apk:install