Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms
In directory
james.mmbase.org:/tmp/cvs-serv28864/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms
Modified Files:
AssetUploadAction.java
Log Message:
CMSC-1089 change Assets display in two ways. list and thumbnails. upload
image/attachment
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms
See also: http://www.mmbase.org/jira/browse/CMSC-1089
Index: AssetUploadAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/AssetUploadAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- AssetUploadAction.java 7 Nov 2008 02:54:48 -0000 1.1
+++ AssetUploadAction.java 21 Nov 2008 02:32:59 -0000 1.2
@@ -19,6 +19,8 @@
import org.mmbase.bridge.Cloud;
import org.mmbase.bridge.NodeManager;
+import com.finalist.cmsc.services.versioning.Versioning;
+import com.finalist.cmsc.services.versioning.VersioningException;
import com.finalist.cmsc.struts.MMBaseAction;
import com.finalist.util.http.BulkUploadUtil;
@@ -37,16 +39,23 @@
if (file.getFileSize() != 0 && file.getFileName() != null) {
String uploadFileType = file.getContentType();
+ List<Integer> nodes = null;
if (assetType.equalsIgnoreCase("images")) {
if (uploadFileType.equalsIgnoreCase("image/bmp") ||
uploadFileType.equalsIgnoreCase("image/jpeg") ||
uploadFileType.equalsIgnoreCase("image/gif")){
- List<Integer> nodes = BulkUploadUtil.store(cloud, manager,
parentchannel, file);
+ nodes = BulkUploadUtil.store(cloud, manager, parentchannel,
file);
request.setAttribute("uploadedAssets", nodes);
}
}
else if(assetType.equalsIgnoreCase("attachments")){
- List<Integer> nodes = BulkUploadUtil.store(cloud, manager,
parentchannel, file);
+ nodes = BulkUploadUtil.store(cloud, manager, parentchannel, file);
request.setAttribute("uploadedAssets", nodes);
}
+ // to archive the upload asset
+ if (nodes != null && nodes.size() > 0) {
+ for (Integer node : nodes) {
+ Versioning.addVersion(cloud.getNode(node));
+ }
+ }
}
return new ActionForward(mapping.findForward(SUCCESS).getPath() +
"?type=asset&direction=down&parentchannel="
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
