You are viewing a plain text version of this content. The canonical link for it is here.
Posted to graffito-commits@incubator.apache.org by cl...@apache.org on 2006/11/08 20:10:31 UTC
svn commit: r472620 -
/incubator/graffito/trunk/applications/browser/src/java/org/apache/portals/graffito/portlets/browser/actions/DocumentAction.java
Author: clombart
Date: Wed Nov 8 12:10:31 2006
New Revision: 472620
URL: http://svn.apache.org/viewvc?view=rev&rev=472620
Log:
fix issue GRFT-113
Modified:
incubator/graffito/trunk/applications/browser/src/java/org/apache/portals/graffito/portlets/browser/actions/DocumentAction.java
Modified: incubator/graffito/trunk/applications/browser/src/java/org/apache/portals/graffito/portlets/browser/actions/DocumentAction.java
URL: http://svn.apache.org/viewvc/incubator/graffito/trunk/applications/browser/src/java/org/apache/portals/graffito/portlets/browser/actions/DocumentAction.java?view=diff&rev=472620&r1=472619&r2=472620
==============================================================================
--- incubator/graffito/trunk/applications/browser/src/java/org/apache/portals/graffito/portlets/browser/actions/DocumentAction.java (original)
+++ incubator/graffito/trunk/applications/browser/src/java/org/apache/portals/graffito/portlets/browser/actions/DocumentAction.java Wed Nov 8 12:10:31 2006
@@ -256,12 +256,7 @@
String uri = this.getUri(request);
Document document = documentService.getDocument(uri);
-
- BeanUtil.populate(request, document);
- document.setProperty("title", request.getParameter("title"));
- document.setProperty("description", request.getParameter("description"));
- document.setProperty("owner", request.getParameter("owner"));
-
+
String documentContent = request.getParameter("documentContent");
if (documentContent != null)
{
@@ -279,6 +274,13 @@
document.getDocumentStream().setContent(documentContent.getBytes());
}
document.setSize(documentContent.length());
+ }
+ else
+ {
+ BeanUtil.populate(request, document);
+ document.setProperty("title", request.getParameter("title"));
+ document.setProperty("description", request.getParameter("description"));
+ document.setProperty("owner", request.getParameter("owner"));
}
documentService.updateDocument(document);