Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms
In directory james.mmbase.org:/tmp/cvs-serv385
Modified Files:
ImageUploadAction.java
Log Message:
CMSC-681 Asset Maintenance
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-681
Index: ImageUploadAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/ImageUploadAction.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- ImageUploadAction.java 12 Jan 2009 10:46:06 -0000 1.7
+++ ImageUploadAction.java 14 Jan 2009 03:51:20 -0000 1.8
@@ -5,6 +5,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.commons.lang.StringUtils;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
@@ -31,7 +32,7 @@
String exceed = "yes";
int nodeId = 0;
- if (parentchannel.equalsIgnoreCase(ALL)) {
+ if (parentchannel.equalsIgnoreCase(ALL) ||
StringUtils.isEmpty(parentchannel)) {
parentchannel = (String) request.getSession().getAttribute(CREATION);
}
if (isImage(file.getFileName())) {
@@ -54,6 +55,9 @@
} else {
exist = "0";
}
+ } else {
+ exist = "0";
+ exceed = "no";
}
return new ActionForward(mapping.findForward(SUCCESS).getPath() +
"?uploadAction=select&exist=" + exist
+ "&exceed=" + exceed + "&channelid=" + parentchannel +
"&uploadedNodes=" + nodeId, true);
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
