summaryrefslogtreecommitdiffstats
path: root/app/acf-util
diff options
context:
space:
mode:
authorTed Trask <ttrask01@yahoo.com>2009-12-28 16:46:05 +0000
committerTed Trask <ttrask01@yahoo.com>2009-12-28 16:46:05 +0000
commit2799724a1683023f9eaa618127af9d07c0c46f23 (patch)
treed42ddb099d5178fc09fd18c361964a30dce43d2f /app/acf-util
parenta506f1cf5243a5458af1ec4c13946fc88a7dbb84 (diff)
downloadacf-core-2799724a1683023f9eaa618127af9d07c0c46f23.tar.bz2
acf-core-2799724a1683023f9eaa618127af9d07c0c46f23.tar.xz
Added ability to manage roles based on which roles file they're in = more granularity of roles.
Diffstat (limited to 'app/acf-util')
-rwxr-xr-xapp/acf-util/password-status-html.lsp2
-rw-r--r--app/acf-util/roles-viewroles-html.lsp15
2 files changed, 8 insertions, 9 deletions
diff --git a/app/acf-util/password-status-html.lsp b/app/acf-util/password-status-html.lsp
index 045d770..eb960be 100755
--- a/app/acf-util/password-status-html.lsp
+++ b/app/acf-util/password-status-html.lsp
@@ -29,7 +29,7 @@ io.write("</span>")
<TD STYLE='border:none;'><%= html.html_escape(user.value.username.value) %></TD>
</TR><TR>
<TD STYLE='border:none;'><B><%= html.html_escape(user.value.roles.label) %></B></TD>
- <TD STYLE='border:none;'><%= html.html_escape(table.concat(user.value.roles.value, " / ")) %></TD>
+ <TD STYLE='border:none;'><%= html.html_escape(table.concat(user.value.roles.value, ", ")) %></TD>
</TR><TR>
<TD STYLE='border:none;'><B>Option</B></TD>
<TD STYLE='border:none;'>
diff --git a/app/acf-util/roles-viewroles-html.lsp b/app/acf-util/roles-viewroles-html.lsp
index 68aac01..1f8f24e 100644
--- a/app/acf-util/roles-viewroles-html.lsp
+++ b/app/acf-util/roles-viewroles-html.lsp
@@ -17,23 +17,22 @@
<H2>Existing roles</H2>
<DL>
<TABLE>
-<% if view.value.default_roles then %>
- <% for x,role in pairs(view.value.default_roles.value) do %>
- <TR><TD><dt><img src='/skins/static/tango/16x16/categories/applications-system.png' height='16' width='16'> <%= html.html_escape(role) %></dt>
+<% if view.value.defined_roles then %>
+ <% for x,role in pairs(view.value.defined_roles.value) do %>
+ <TR><TD><dt><img src='/skins/static/tango/16x16/apps/system-users.png' height='16' width='16'> <%= html.html_escape(role) %></dt>
<dd>
[<a href='viewroleperms?role=<%= html.html_escape(role) %>'>View this role</a>]
[<a href='editrole?role=<%= html.html_escape(role) %>&redir=<%= html.html_escape(page_info.orig_action) %>'>Edit this role</a>]
+ [<a href='deleterole?role=<%= html.html_escape(role) %>'>Delete this role</a>]
</dd></TD></TR>
<% end %>
<% end %>
-<% if view.value.defined_roles then %>
- <% table.sort(view.value.defined_roles.value) %>
- <% for x,role in pairs(view.value.defined_roles.value) do %>
- <TR><TD><dt><img src='/skins/static/tango/16x16/apps/system-users.png' height='16' width='16'> <%= html.html_escape(role) %></dt>
+<% if view.value.default_roles then %>
+ <% for x,role in pairs(view.value.default_roles.value) do %>
+ <TR><TD><dt><img src='/skins/static/tango/16x16/categories/applications-system.png' height='16' width='16'> <%= html.html_escape(role) %></dt>
<dd>
[<a href='viewroleperms?role=<%= html.html_escape(role) %>'>View this role</a>]
[<a href='editrole?role=<%= html.html_escape(role) %>&redir=<%= html.html_escape(page_info.orig_action) %>'>Edit this role</a>]
- [<a href='deleterole?role=<%= html.html_escape(role) %>'>Delete this role</a>]
</dd></TD></TR>
<% end %>
<% end %>