[MMBASE CVS] contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms AssetUploadAction.java

[kevinshen]

Update of 
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms
In directory 
james.mmbase.org:/tmp/cvs-serv19842/src/java/com/finalist/cmsc/repository/forms

Modified Files:
        AssetUploadAction.java 
Log Message:
CMSC-1208 Can delete attachements in channel with insuficient rights


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-1208


Index: AssetUploadAction.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/AssetUploadAction.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- AssetUploadAction.java      9 Jan 2009 03:32:26 -0000       1.10
+++ AssetUploadAction.java      9 Jan 2009 09:03:46 -0000       1.11
@@ -28,11 +28,16 @@
 
       String exceed = "yes";
       String exist = "1";
+      String emptyFile = "no";
       String url = "";
       int nodeId = 0;
       int fileSize = file.getFileSize();
 
-      if (maxFileSizeBiggerThan(fileSize) && file.getFileName() != null) {
+      if( fileSize == 0 || StringUtils.isEmpty(file.getFileName())){
+         emptyFile = "yes";
+      }
+      
+      if (maxFileSizeBiggerThan(fileSize)&&emptyFile.equalsIgnoreCase("no")) {
          exceed = "no";
          String assetType = "";
          if (isImage(file.getFileName())) {
@@ -55,6 +60,7 @@
             }
          }
       }
+      if(emptyFile.equalsIgnoreCase("no")){
       if (StringUtils.isNotEmpty(insertAsset)) {
          if (insertAsset.equalsIgnoreCase("insertAsset")) {
             url = mapping.findForward("insertAsset").getPath() + 
"&uploadAction=select&exist=" + exist + "&exceed="
@@ -64,6 +70,19 @@
          url = mapping.findForward(SUCCESS).getPath() + 
"?type=asset&direction=down&exist=" + exist + "&exceed="
                + exceed + "&parentchannel=" + parentchannel;
       }
+      }else{
+         if (StringUtils.isNotEmpty(insertAsset)) {
+            if (insertAsset.equalsIgnoreCase("insertAsset")) {
+               url = mapping.findForward("insertAsset").getPath() + 
"&uploadAction=select" +
+                  "&parentchannel=" + parentchannel + "&uploadedNodes=" + 
nodeId+"&emptyFile="+ emptyFile;
+            }
+         } else {
+            url = mapping.findForward(SUCCESS).getPath() + 
"?type=asset&direction=down" +
+               "&parentchannel=" + parentchannel+"&emptyFile="+ emptyFile;
+         }
+      }
+      
+      
       return new ActionForward(url, true);
    }
 }
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs