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/12 10:43:10 UTC
svn commit: r413610 - in /lenya/trunk/src:
java/org/apache/lenya/cms/site/usecases/Assets.java
webapp/lenya/usecases/tab/assets.jx
Author: andreas
Date: Mon Jun 12 01:43:10 2006
New Revision: 413610
URL: http://svn.apache.org/viewvc?rev=413610&view=rev
Log:
Asset upload: creator, rights, and title are optional. The creator defaults to the user ID instead of the name. This fixes bug #39510. Thanks to Joern Nettingsmeier for the patch.
Modified:
lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/Assets.java
lenya/trunk/src/webapp/lenya/usecases/tab/assets.jx
Modified: lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/Assets.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/Assets.java?rev=413610&r1=413609&r2=413610&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/Assets.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/site/usecases/Assets.java Mon Jun 12 01:43:10 2006
@@ -42,16 +42,6 @@
*/
void validate() throws UsecaseException {
- if (getParameterAsString("title").length() == 0) {
- addErrorMessage("Please enter a title.");
- }
- if (getParameterAsString("creator").length() == 0) {
- addErrorMessage("Please enter a creator.");
- }
- if (getParameterAsString("rights").length() == 0) {
- addErrorMessage("Please enter the rights.");
- }
-
/*
* The <input type="file"/> value cannot be passed to the next screen because
* the browser doesn't allow this for security reasons.
@@ -63,7 +53,7 @@
Part file = getPart("file");
if (file == null) {
- addErrorMessage("Please choose a file to upload.");
+ addErrorMessage("Please choose a file to upload. Your previous choice could not be preselected for security reasons.");
}
}
@@ -92,14 +82,7 @@
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) {
Modified: lenya/trunk/src/webapp/lenya/usecases/tab/assets.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/webapp/lenya/usecases/tab/assets.jx?rev=413610&r1=413609&r2=413610&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecases/tab/assets.jx (original)
+++ lenya/trunk/src/webapp/lenya/usecases/tab/assets.jx Mon Jun 12 01:43:10 2006
@@ -85,15 +85,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