Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms
In directory
james.mmbase.org:/tmp/cvs-serv2017/java/com/finalist/cmsc/repository/forms
Modified Files:
AssetSearchAction.java AssetSearchForm.java
AssetUploadAction.java
Added Files:
AssetSearchInitAction.java ImageUploadAction.java
ImageUploadForm.java
Log Message:
CMSC-1126 using Assets in contentElements
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-1126
AssetSearchInitAction.java is new
ImageUploadAction.java is new
ImageUploadForm.java is new
Index: AssetSearchAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/AssetSearchAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- AssetSearchAction.java 27 Oct 2008 05:43:58 -0000 1.3
+++ AssetSearchAction.java 2 Dec 2008 02:40:20 -0000 1.4
@@ -56,6 +56,12 @@
AssetSearchForm searchForm = (AssetSearchForm) form;
String deleteAssetRequest = request.getParameter("deleteAssetRequest");
+ String show = request.getParameter("show");
+ if(StringUtils.isNotEmpty(show)){
+ show = "thumbnail";
+ }else{
+ show = null;
+ }
if (StringUtils.isNotEmpty(deleteAssetRequest)) {
if (deleteAssetRequest.startsWith("massDelete:")) {
@@ -82,6 +88,7 @@
}
}
addToRequest(request, "typesList", typesList);
+ addToRequest(request, "show", show);
// Switching tab, no searching.
if ("false".equalsIgnoreCase(searchForm.getSearch())) {
@@ -163,12 +170,17 @@
// Add the title constraint:
if (StringUtils.isNotEmpty(searchForm.getTitle())) {
-
queryStringComposer.addParameter(AssetElementUtil.TITLE_FIELD,
searchForm.getTitle().trim());
Field field = nodeManager.getField(AssetElementUtil.TITLE_FIELD);
Constraint titleConstraint = SearchUtil.createLikeConstraint(query,
field, searchForm.getTitle().trim());
SearchUtil.addConstraint(query, titleConstraint);
}
+ if (StringUtils.isNotEmpty(searchForm.getTitle())) {
+ queryStringComposer.addParameter(AssetElementUtil.CREATOR_FIELD,
searchForm.getTitle().trim());
+ Field field = nodeManager.getField(AssetElementUtil.CREATOR_FIELD);
+ Constraint creatorConstraint = SearchUtil.createLikeConstraint(query,
field, searchForm.getTitle().trim());
+ SearchUtil.addORConstraint(query, creatorConstraint);
+ }
// Set the objectid constraint
if (StringUtils.isNotEmpty(searchForm.getObjectid())) {
@@ -229,7 +241,6 @@
searchForm.setResultCount(resultCount);
searchForm.setResults(results);
request.setAttribute(GETURL, queryStringComposer.getQueryString());
-
return super.execute(mapping, form, request, response, cloud);
}
@@ -275,7 +286,14 @@
Cloud cloud = provider.getCloud();
Node objectNode = cloud.getNode(nunmber);
- RepositoryUtil.removeCreationRelForContent(objectNode);
+
+ // NodeList channels = RepositoryUtil.getDeletionChannels(objectNode);
+ Node channelNode = RepositoryUtil.getCreationChannel(objectNode);
+ if (channelNode != null ) {
+ RepositoryUtil.addAssetDeletionRelation(objectNode,channelNode);
+ RepositoryUtil.removeCreationRelForAsset(objectNode);
+ }
+
RepositoryUtil.addAssetToChannel(objectNode,
RepositoryUtil.getTrash(cloud));
// unpublish and remove from workflow
Index: AssetSearchForm.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/AssetSearchForm.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- AssetSearchForm.java 24 Oct 2008 04:24:27 -0000 1.2
+++ AssetSearchForm.java 2 Dec 2008 02:40:20 -0000 1.3
@@ -18,7 +18,6 @@
private String mode = "basic";
private String search = "true";
private String parentchannelpath = "";
-
public String getAssettypes() {
return assettypes;
}
@@ -122,5 +121,4 @@
public void setParentchannelpath(String parentchannelpath) {
this.parentchannelpath = parentchannelpath;
}
-
}
Index: AssetUploadAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/AssetUploadAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- AssetUploadAction.java 21 Nov 2008 02:34:47 -0000 1.3
+++ AssetUploadAction.java 2 Dec 2008 02:40:20 -0000 1.4
@@ -40,12 +40,12 @@
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")){
+ if (uploadFileType.equalsIgnoreCase("image/bmp") ||
uploadFileType.equalsIgnoreCase("image/jpeg")
+ || uploadFileType.equalsIgnoreCase("image/gif") ||
uploadFileType.equalsIgnoreCase("image/png")) {
nodes = BulkUploadUtil.store(cloud, manager, parentchannel,
file);
request.setAttribute("uploadedAssets", nodes);
}
- }
- else if(assetType.equalsIgnoreCase("attachments")){
+ } else if (assetType.equalsIgnoreCase("attachments")) {
nodes = BulkUploadUtil.store(cloud, manager, parentchannel, file);
request.setAttribute("uploadedAssets", nodes);
}
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
