You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2004/04/30 18:34:23 UTC
cvs commit: cocoon-lenya/src/webapp/lenya/xslt/admin/users users.xsl
andreas 2004/04/30 09:34:23
Modified: src/webapp/lenya/content/admin/users users.xsp
src/webapp/lenya/xslt/admin/users users.xsl
Log:
don't allow to delete current user
Revision Changes Path
1.7 +13 -0 cocoon-lenya/src/webapp/lenya/content/admin/users/users.xsp
Index: users.xsp
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/content/admin/users/users.xsp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- users.xsp 13 Mar 2004 12:31:33 -0000 1.6
+++ users.xsp 30 Apr 2004 16:34:23 -0000 1.7
@@ -35,14 +35,27 @@
<page>
<users>
<xsp:logic>
+ String currentUserId = <input:get-attribute module="access-control" name="user-id" as="string"/>;
+
UserManager userManager = (UserManager)
<input:get-attribute module="access-control" name="user-manager" as="object"/>;
+
+ User currentUser = userManager.getUser(currentUserId);
+
User[] users = userManager.getUsers();
for (int userIndex = 0; userIndex < users.length; userIndex++) {
User user = users[userIndex];
+
+ boolean deletable = true;
+
+ if (user == currentUser) {
+ deletable = false;
+ }
+
</xsp:logic>
<user>
+ <xsp:attribute name="deletable"><xsp:expr>deletable</xsp:expr></xsp:attribute>
<id><xsp:expr>user.getId()</xsp:expr></id>
<name><xsp:expr>user.getName()</xsp:expr></name>
<email><xsp:expr>user.getEmail()</xsp:expr></email>
1.10 +6 -2 cocoon-lenya/src/webapp/lenya/xslt/admin/users/users.xsl
Index: users.xsl
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/xslt/admin/users/users.xsl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- users.xsl 28 Apr 2004 15:00:05 -0000 1.9
+++ users.xsl 30 Apr 2004 16:34:23 -0000 1.10
@@ -75,7 +75,11 @@
<form method="GET">
<input type="hidden" name="lenya.usecase" value="userDeleteUser"/>
<input name="user-id" type="hidden" value="{id}"/>
- <input i18n:attr="value" type="submit" value="Delete"/>
+ <input i18n:attr="value" type="submit" value="Delete">
+ <xsl:if test="@deletable = 'false'">
+ <xsl:attribute name="disabled">disabled</xsl:attribute>
+ </xsl:if>
+ </input>
</form>
</td>
</tr>
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org