Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms
In directory
james.mmbase.org:/tmp/cvs-serv26564/src/java/com/finalist/cmsc/repository/forms
Modified Files:
ContentAction.java ImageUploadAction.java
Removed Files:
ImageUploadForm.java
Log Message:
CMSC-1205 Assets bug container issue
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-1205
Index: ContentAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/ContentAction.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- ContentAction.java 23 Dec 2008 10:11:53 -0000 1.13
+++ ContentAction.java 7 Jan 2009 10:08:04 -0000 1.14
@@ -90,12 +90,14 @@
createdNumbers.put(String.valueOf(createdElement.getNumber()),
createdElement);
}
addToRequest(request, "createdNumbers", createdNumbers);
+ //cmsc-1205 don't refresh channel tree when not necessary
+ String type = request.getParameter("type");
//cmsc-144 make reorder icon show up
- if(elementCount==2){
+ if(elementCount==2&& type != null){
request.setAttribute("refresh", true);
}
//reset the show mode of assets in the session when enter another
channel
- if(request.getParameter("type")==null){
+ if(type==null){
request.getSession().removeAttribute("show");
request.getSession().removeAttribute("imageOnly");
}
Index: ImageUploadAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/ImageUploadAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- ImageUploadAction.java 6 Jan 2009 07:59:41 -0000 1.4
+++ ImageUploadAction.java 7 Jan 2009 10:08:04 -0000 1.5
@@ -16,6 +16,9 @@
public class ImageUploadAction extends AbstractUploadAction {
+ private static final String ALL = "all";
+ private static final String CREATION = "creation";
+
@Override
public ActionForward execute(ActionMapping mapping, ActionForm form,
HttpServletRequest request,
HttpServletResponse response, Cloud cloud) throws Exception {
@@ -24,6 +27,10 @@
String parentchannel = imageUploadForm.getParentchannel();
FormFile file = imageUploadForm.getFile();
+ if (parentchannel.equalsIgnoreCase(ALL)) {
+ parentchannel = (String) request.getSession().getAttribute(CREATION);
+ }
+
int nodeId = 0;
String exist = "0";
String exceed = "no";
@@ -43,6 +50,7 @@
} else {
exceed = "yes";
}
+ nodeId = nodes.get(0);
}
// to archive the upload asset
addRelationsForNodes(nodes, cloud);
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
