You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by jw...@apache.org on 2005/04/22 12:20:47 UTC
svn commit: r164209 - in /lenya/branches/BRANCH_1_2_X/src/webapp/lenya:
content/admin/users/overview.xsp xslt/admin/users/overview.xsl
Author: jwkaltz
Date: Fri Apr 22 03:20:44 2005
New Revision: 164209
URL: http://svn.apache.org/viewcvs?rev=164209&view=rev
Log:
[minor change] applied Jann's suggestions (id=34567) to show ldap id of user; will take a look at trunk as well
Modified:
lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/admin/users/overview.xsp (contents, props changed)
lenya/branches/BRANCH_1_2_X/src/webapp/lenya/xslt/admin/users/overview.xsl (contents, props changed)
Modified: lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/admin/users/overview.xsp
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/admin/users/overview.xsp?rev=164209&r1=164208&r2=164209&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/admin/users/overview.xsp (original)
+++ lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/admin/users/overview.xsp Fri Apr 22 03:20:44 2005
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
- Copyright 1999-2004 The Apache Software Foundation
+ Copyright 1999-2005 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
limitations under the License.
-->
-<!-- $Id: overview.xsp,v 1.9 2004/03/13 12:31:33 gregor Exp $ -->
+<!-- $Id$ -->
<xsp:page
language="java"
@@ -55,6 +55,14 @@
<user>
<xsp:attribute name="ldap"><xsp:expr>user instanceof LDAPUser</xsp:expr></xsp:attribute>
<id><xsp:expr>user.getId()</xsp:expr></id>
+ <xsp:logic>
+ if (user instanceof LDAPUser) {
+ LDAPUser ldapuser = (LDAPUser) user;
+ <xsp:content>
+ <ldapid><xsp:expr>ldapuser.getLdapId()</xsp:expr></ldapid>
+ </xsp:content>
+ }
+ </xsp:logic>
<name><xsp:expr>user.getName()</xsp:expr></name>
<email><xsp:expr>user.getEmail()</xsp:expr></email>
<description><xsp:expr>user.getDescription()</xsp:expr></description>
@@ -69,7 +77,7 @@
</xsp:logic>
</groups>
</user>
-
+
<xsp:logic>
}
else {
Propchange: lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/admin/users/overview.xsp
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Fri Apr 22 03:20:44 2005
@@ -1 +1 @@
-author date id revision
+Id
Modified: lenya/branches/BRANCH_1_2_X/src/webapp/lenya/xslt/admin/users/overview.xsl
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/xslt/admin/users/overview.xsl?rev=164209&r1=164208&r2=164209&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/webapp/lenya/xslt/admin/users/overview.xsl (original)
+++ lenya/branches/BRANCH_1_2_X/src/webapp/lenya/xslt/admin/users/overview.xsl Fri Apr 22 03:20:44 2005
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright 1999-2004 The Apache Software Foundation
+ Copyright 1999-2005 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
limitations under the License.
-->
-<!-- $Id: overview.xsl,v 1.11 2004/06/01 14:29:23 andreas Exp $ -->
+<!-- $Id$ -->
<xsl:stylesheet
version="1.0"
@@ -62,6 +62,12 @@
<td class="lenya-entry-caption"><i18n:text>User ID</i18n:text>:</td>
<td><xsl:value-of select="id"/></td>
</tr>
+ <xsl:if test="@ldap = 'true'">
+ <tr>
+ <td class="lenya-entry-caption"><i18n:text>LDAP ID</i18n:text>:</td>
+ <td><xsl:value-of select="ldapid"/></td>
+ </tr>
+ </xsl:if>
<tr>
<td class="lenya-entry-caption"><i18n:text>Full Name</i18n:text>:</td>
<td><xsl:value-of select="name"/></td>
Propchange: lenya/branches/BRANCH_1_2_X/src/webapp/lenya/xslt/admin/users/overview.xsl
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Fri Apr 22 03:20:44 2005
@@ -1 +1 @@
-author date id revision
+Id
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org