[Cobricks-cvscommit] cobricks2/web/user role-edit.html

[Michael K. <ko...@us...>]

Update of /cvsroot/cobricks/cobricks2/web/user
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9933

Modified Files:
	role-edit.html 
Log Message:


Index: role-edit.html
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/web/user/role-edit.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- role-edit.html	6 Jan 2005 16:01:40 -0000	1.4
+++ role-edit.html	24 Jan 2006 06:52:13 -0000	1.5
@@ -54,8 +54,12 @@
 #set ( $authadduser = $userPresenter.checkPermission($userId, "userrole", "adduser", "roleid=$roleid") )
 #set ( $authremoveuser = $userPresenter.checkPermission($userId, "userrole", "removeuser", "roleid=$roleid") )
 
-Update Permission: $authupdate
 <p>
+#if ("$!authupdate" != "true")
+<div class="error">You do not have the permission to update this user
+role!</div>
+<p>
+#end
 
 <form action="/USER" method="post">
 <input type="hidden" name="cmd" value="updaterole"/>
@@ -117,12 +121,12 @@
 
 <select name="perms" multiple="true" size="5">
 #foreach( $i in $userPresenter.getAccessPermissions($roleid) )
-<option value="$i.getId()" selected="true">$i.getDomain() - $i.getAction()
+<option value="$i.getId()">$i.getDomain() - $i.getAction() $i.getAttrsAsString()
 #end
 </select>
 #if ( $authupdate == "true" )
 <br>Deselect permissions for deleting the permission.<br>
-<input type="submit" class="submit" name="subcmd" value="Delete (deselected) Permissions"/>
+<input type="submit" class="submit" name="subcmd" value="Delete selected Permissions"/>
 <p>
 Domain <select name="permdomain" size="1">
 #foreach( $i in $userManager.getAccessControl().getDomains() )
@@ -138,7 +142,7 @@
 <select name="roleusers" multiple="true" size="5">
 #foreach( $i in $userPresenter.getAccessRoleUsers($roleid) )
 #set ($user = $userManager.getUser($i) )
-<option value="$i" selected="true">
+<option value="$i">
 #if ($role.isUserDelegate($i))
 +
 #end
@@ -147,12 +151,12 @@
 </select>
 #if ( $authremoveuser == "true" )
 <br>Deselect users for unassigning them from the role.<br>
-<input type="submit" class="submit" name="subcmd" value="Update User Assignments"/>
+<input type="submit" class="submit" name="subcmd" value="Delete selected Users"/>
 #end
 
 #if ( $authadduser == "true" )
 <p>
-User Login <input name="userlogin" size="30"> 
+User Login <input name="userlogin" size="30"><br>
 <input type="checkbox" name="delegate" value="true"> delegate<br>
 <input type="submit" class="submit" name="subcmd" value="Add User"/>
 #end