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 2006/06/13 18:03:44 UTC
svn commit: r413927 - in /lenya/trunk/src:
java/org/apache/lenya/cms/editors/InsertAsset.java
modules/bxe/usecases/insertAsset.jx
Author: andreas
Date: Tue Jun 13 09:03:44 2006
New Revision: 413927
URL: http://svn.apache.org/viewvc?rev=413927&view=rev
Log:
BXE asset upload: user ID as creator default, creator+title+rights are optional. This fixes bug #39510. Thanks to Joern Nettingsmeier for the patch.
Modified:
lenya/trunk/src/java/org/apache/lenya/cms/editors/InsertAsset.java
lenya/trunk/src/modules/bxe/usecases/insertAsset.jx
Modified: lenya/trunk/src/java/org/apache/lenya/cms/editors/InsertAsset.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/java/org/apache/lenya/cms/editors/InsertAsset.java?rev=413927&r1=413926&r2=413927&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/editors/InsertAsset.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/editors/InsertAsset.java Tue Jun 13 09:03:44 2006
@@ -45,14 +45,7 @@
try {
User user = getSession().getIdentity().getUser();
if (user != null) {
- String creator;
- String name = user.getName();
- if (name != null && !name.trim().equals("")) {
- creator = name;
- } else {
- creator = user.getId();
- }
- setParameter("creator", creator);
+ setParameter("creator", user.getId());
}
} catch (final Exception e) {
throw new RuntimeException(e);
Modified: lenya/trunk/src/modules/bxe/usecases/insertAsset.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/bxe/usecases/insertAsset.jx?rev=413927&r1=413926&r2=413927&view=diff
==============================================================================
--- lenya/trunk/src/modules/bxe/usecases/insertAsset.jx (original)
+++ lenya/trunk/src/modules/bxe/usecases/insertAsset.jx Tue Jun 13 09:03:44 2006
@@ -110,15 +110,15 @@
<td><input type="file" name="file" class="lenya-form-element"/></td>
</tr>
<tr>
- <td class="lenya-entry-caption"><label for="title"><i18n:text>Title</i18n:text> *</label></td>
+ <td class="lenya-entry-caption"><label for="title"><i18n:text>Title</i18n:text></label></td>
<td><input type="text" name="title" class="lenya-form-element" value="${usecase.getParameter('title')}"/></td>
</tr>
<tr>
- <td class="lenya-entry-caption"><label for="creator"><i18n:text>Creator</i18n:text> *</label></td>
+ <td class="lenya-entry-caption"><label for="creator"><i18n:text>Creator</i18n:text></label></td>
<td><input type="text" name="creator" class="lenya-form-element" value="${usecase.getParameter('creator')}"/></td>
</tr>
<tr>
- <td class="lenya-entry-caption"><label for="rights"><i18n:text>Rights</i18n:text> *</label></td>
+ <td class="lenya-entry-caption"><label for="rights"><i18n:text>Rights</i18n:text></label></td>
<td><input type="text" name="rights" class="lenya-form-element" value="${usecase.getParameter('rights')}"/></td>
</tr>
<tr>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org