Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms
In directory
james.mmbase.org:/tmp/cvs-serv10578/contentrepository/src/java/com/finalist/cmsc/repository/forms
Modified Files:
AssetSearchForm.java AssetSearchInitAction.java
AssetUploadAction.java AssetUploadForm.java
ImageUploadAction.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: AssetSearchForm.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/AssetSearchForm.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- AssetSearchForm.java 25 Dec 2008 05:40:55 -0000 1.5
+++ AssetSearchForm.java 9 Jan 2009 03:32:26 -0000 1.6
@@ -19,6 +19,7 @@
private String search = "true";
private String parentchannelpath = "";
private String searchShow = "list";
+ private String insertAsset = "insertAsset";
public String getAssettypes() {
return assettypes;
@@ -131,4 +132,12 @@
public String getShow() {
return searchShow;
}
+
+ public void setInsertAsset(String insertAsset) {
+ this.insertAsset = insertAsset;
+ }
+
+ public String getInsertAsset() {
+ return insertAsset;
+ }
}
Index: AssetSearchInitAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/AssetSearchInitAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- AssetSearchInitAction.java 25 Dec 2008 05:40:55 -0000 1.3
+++ AssetSearchInitAction.java 9 Jan 2009 03:32:26 -0000 1.4
@@ -19,6 +19,8 @@
public class AssetSearchInitAction extends MMBaseAction {
+ private static final String CREATION = "creation";
+
@Override
public ActionForward execute(ActionMapping mapping, ActionForm form,
HttpServletRequest request,
HttpServletResponse response, Cloud cloud) throws Exception {
@@ -56,7 +58,15 @@
}
}
addToRequest(request, "typesList", typesList);
-
+ String parentchannel = (String)
request.getSession().getAttribute(CREATION);
+ if (StringUtils.isNotEmpty(parentchannel)) {
+ request.setAttribute("parentchannel", parentchannel);
+ }
+ String insertAsset = request.getParameter("insertAsset");
+ if (StringUtils.isNotEmpty(insertAsset)) {
+ request.setAttribute("insertAsset", insertAsset);
+ return mapping.findForward("insertAsset");
+ }
return mapping.findForward("searchoptions");
}
Index: AssetUploadAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/AssetUploadAction.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- AssetUploadAction.java 6 Jan 2009 07:59:41 -0000 1.9
+++ AssetUploadAction.java 9 Jan 2009 03:32:26 -0000 1.10
@@ -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;
@@ -22,11 +23,17 @@
AssetUploadForm assetUploadForm = (AssetUploadForm) form;
String parentchannel = assetUploadForm.getParentchannel();
+ String insertAsset = assetUploadForm.getInsertAsset();
FormFile file = assetUploadForm.getFile();
- String exceed = "no";
+ String exceed = "yes";
+ String exist = "1";
+ String url = "";
+ int nodeId = 0;
+ int fileSize = file.getFileSize();
- if (file.getFileSize() != 0 && file.getFileName() != null) {
+ if (maxFileSizeBiggerThan(fileSize) && file.getFileName() != null) {
+ exceed = "no";
String assetType = "";
if (isImage(file.getFileName())) {
assetType = "images";
@@ -34,25 +41,29 @@
assetType = "attachments";
}
- List<Integer> nodes = null;
NodeManager manager = cloud.getNodeManager(assetType);
- int fileSize = file.getFileSize();
- if (maxFileSizeBiggerThan(fileSize)) {
if (isNewFile(file, manager)) {
+ exist = "0";
+ List<Integer> nodes = null;
nodes = BulkUploadUtil.store(cloud, manager, parentchannel,
file);
request.setAttribute("uploadedAssets", nodes);
- } else {
- return new ActionForward(mapping.findForward(SUCCESS).getPath()
- + "?type=asset&direction=down&exist=1&exceed=" + exceed +
"&parentchannel=" + parentchannel, true);
- }
- } else {
- exceed = "yes";
- }
// to archive the upload asset
+ if (nodes != null) {
addRelationsForNodes(nodes, cloud);
+ nodeId = nodes.get(0);
+ }
+ }
+ }
+ if (StringUtils.isNotEmpty(insertAsset)) {
+ if (insertAsset.equalsIgnoreCase("insertAsset")) {
+ url = mapping.findForward("insertAsset").getPath() +
"&uploadAction=select&exist=" + exist + "&exceed="
+ + exceed + "&parentchannel=" + parentchannel +
"&uploadedNodes=" + nodeId;
+ }
+ } else {
+ url = mapping.findForward(SUCCESS).getPath() +
"?type=asset&direction=down&exist=" + exist + "&exceed="
+ + exceed + "&parentchannel=" + parentchannel;
}
- return new ActionForward(mapping.findForward(SUCCESS).getPath() +
"?type=asset&direction=down&exist=0&exceed="
- + exceed + "&parentchannel=" + parentchannel, true);
+ return new ActionForward(url, true);
}
}
Index: AssetUploadForm.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/AssetUploadForm.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- AssetUploadForm.java 9 Dec 2008 06:04:04 -0000 1.2
+++ AssetUploadForm.java 9 Jan 2009 03:32:26 -0000 1.3
@@ -7,6 +7,7 @@
public class AssetUploadForm extends ActionForm {
private String parentchannel;
+ private String insertAsset;
private FormFile file;
public String getParentchannel() {
@@ -24,4 +25,12 @@
public void setFile(FormFile file) {
this.file = file;
}
+
+ public void setInsertAsset(String insertAsset) {
+ this.insertAsset = insertAsset;
+ }
+
+ public String getInsertAsset() {
+ return insertAsset;
+ }
}
Index: ImageUploadAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/ImageUploadAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- ImageUploadAction.java 7 Jan 2009 10:08:04 -0000 1.5
+++ ImageUploadAction.java 9 Jan 2009 03:32:26 -0000 1.6
@@ -27,33 +27,29 @@
String parentchannel = imageUploadForm.getParentchannel();
FormFile file = imageUploadForm.getFile();
+ String exist = "1";
+ String exceed = "yes";
+ int nodeId = 0;
+
if (parentchannel.equalsIgnoreCase(ALL)) {
parentchannel = (String) request.getSession().getAttribute(CREATION);
}
-
- int nodeId = 0;
- String exist = "0";
- String exceed = "no";
- NodeManager manager = cloud.getNodeManager("images");
- List<Integer> nodes = null;
-
- if (file.getFileSize() != 0 && file.getFileName() != null) {
if (isImage(file.getFileName())) {
int fileSize = file.getFileSize();
if (maxFileSizeBiggerThan(fileSize)) {
+ NodeManager manager = cloud.getNodeManager("images");
+ exceed = "no";
if (isNewFile(file, manager)) {
+ exist = "0";
+ List<Integer> nodes = null;
nodes = BulkUploadUtil.store(cloud, manager, parentchannel,
file);
- request.setAttribute("uploadedNodes", nodes.size());
- } else {
- exist = "1";
+ // to archive the upload asset
+ if (nodes != null) {
+ addRelationsForNodes(nodes, cloud);
+ nodeId = nodes.get(0);
}
- } else {
- exceed = "yes";
}
- nodeId = nodes.get(0);
}
- // to archive the upload asset
- addRelationsForNodes(nodes, cloud);
}
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
