Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms
In directory james.mmbase.org:/tmp/cvs-serv24861
Modified Files:
Tag: b1_6
AssetSearchInitAction.java AttachmentUploadAction.java
HighFrequencyAssetAction.java ImageUploadAction.java
InsertAssetSearchAction.java UrlCreateAction.java
Log Message:
CMSC-1279 Assets: Relate Image to content element - New search screen
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-1279
Index: AssetSearchInitAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/AssetSearchInitAction.java,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -b -r1.4 -r1.4.2.1
--- AssetSearchInitAction.java 9 Jan 2009 03:32:26 -0000 1.4
+++ AssetSearchInitAction.java 18 Mar 2009 04:34:38 -0000 1.4.2.1
@@ -19,7 +19,7 @@
public class AssetSearchInitAction extends MMBaseAction {
- private static final String CREATION = "creation";
+ private static final String SESSION_CREATION = "creation";
@Override
public ActionForward execute(ActionMapping mapping, ActionForm form,
HttpServletRequest request,
@@ -58,7 +58,7 @@
}
}
addToRequest(request, "typesList", typesList);
- String parentchannel = (String)
request.getSession().getAttribute(CREATION);
+ String parentchannel = (String)
request.getSession().getAttribute(SESSION_CREATION);
if (StringUtils.isNotEmpty(parentchannel)) {
request.setAttribute("parentchannel", parentchannel);
}
Index: AttachmentUploadAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/AttachmentUploadAction.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -b -r1.2.2.1 -r1.2.2.2
--- AttachmentUploadAction.java 18 Mar 2009 03:53:37 -0000 1.2.2.1
+++ AttachmentUploadAction.java 18 Mar 2009 04:34:38 -0000 1.2.2.2
@@ -20,7 +20,7 @@
private static final String ALL = "all";
private static final String SITEASSETS = "siteassets";
- private static final String CREATION = "creation";
+ private static final String SESSION_CREATION = "creation";
@Override
public ActionForward execute(ActionMapping mapping, ActionForm form,
HttpServletRequest request,
@@ -38,7 +38,7 @@
if (parentchannel.equalsIgnoreCase(SITEASSETS)) {
parentchannel = RepositoryUtil.getRoot(cloud);
} else if (parentchannel.equalsIgnoreCase(ALL) ||
StringUtils.isEmpty(parentchannel)) {
- parentchannel = (String) request.getSession().getAttribute(CREATION);
+ parentchannel = (String)
request.getSession().getAttribute(SESSION_CREATION);
}
int fileSize = file.getFileSize();
if (maxFileSizeBiggerThan(fileSize)) {
Index: HighFrequencyAssetAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/HighFrequencyAssetAction.java,v
retrieving revision 1.4.2.3
retrieving revision 1.4.2.4
diff -u -b -r1.4.2.3 -r1.4.2.4
--- HighFrequencyAssetAction.java 18 Mar 2009 03:53:37 -0000 1.4.2.3
+++ HighFrequencyAssetAction.java 18 Mar 2009 04:34:38 -0000 1.4.2.4
@@ -58,7 +58,7 @@
private static final String URLS = "urls";
private static final String ALL = "all";
private static final String SITEASSETS = "siteassets";
- private static final String CREATION = "creation";
+ private static final String SESSION_CREATION = "creation";
private static final String CONTENTELEMENT = "contentelement";
private static final String SOURCE = "source";
private static final String DESTINATION = "destination";
@@ -100,7 +100,7 @@
if (existChannelConstraint) {
// search in the current channel
if (CURRENTCHANNEL.equals(channelid)) {
- channelid = (String) request.getSession().getAttribute(CREATION);
+ channelid = (String)
request.getSession().getAttribute(SESSION_CREATION);
}
query.addStep(channelManager);
RelationStep creationrelStep = query.addRelationStep(assetManager,
CREATIONREL, SOURCE);
Index: ImageUploadAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/ImageUploadAction.java,v
retrieving revision 1.9.2.2
retrieving revision 1.9.2.3
diff -u -b -r1.9.2.2 -r1.9.2.3
--- ImageUploadAction.java 18 Mar 2009 03:53:37 -0000 1.9.2.2
+++ ImageUploadAction.java 18 Mar 2009 04:34:38 -0000 1.9.2.3
@@ -20,7 +20,7 @@
private static final String ALL = "all";
private static final String SITEASSETS = "siteassets";
- private static final String CREATION = "creation";
+ private static final String SESSION_CREATION = "creation";
@Override
public ActionForward execute(ActionMapping mapping, ActionForm form,
HttpServletRequest request,
@@ -38,7 +38,7 @@
if (parentchannel.equalsIgnoreCase(SITEASSETS)) {
parentchannel = RepositoryUtil.getRoot(cloud);
} else if (parentchannel.equalsIgnoreCase(ALL) ||
StringUtils.isEmpty(parentchannel)) {
- parentchannel = (String) request.getSession().getAttribute(CREATION);
+ parentchannel = (String)
request.getSession().getAttribute(SESSION_CREATION);
}
if (isImage(file.getFileName())) {
int fileSize = file.getFileSize();
Index: InsertAssetSearchAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/InsertAssetSearchAction.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -b -r1.1 -r1.1.2.1
--- InsertAssetSearchAction.java 9 Jan 2009 04:30:16 -0000 1.1
+++ InsertAssetSearchAction.java 18 Mar 2009 04:34:38 -0000 1.1.2.1
@@ -49,6 +49,7 @@
public static final String OBJECTID = "objectid";
public static final String PARENTCHANNEL = "parentchannel";
public static final String ASSETTYPES = "assettypes";
+ private static final String SESSION_CREATION = "creation";
public static final String REPOSITORY_SEARCH_RESULTS_PER_PAGE =
"repository.search.results.per.page";
@@ -266,7 +267,7 @@
if (StringUtils.isNotEmpty(insertAsset)) {
request.setAttribute("insertAsset", insertAsset);
}
- String parentchannel = (String)
request.getSession().getAttribute("creation");
+ String parentchannel = (String)
request.getSession().getAttribute(SESSION_CREATION);
if (StringUtils.isNotEmpty(parentchannel)) {
request.setAttribute("parentchannel", parentchannel);
}
Index: UrlCreateAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/UrlCreateAction.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -b -r1.2 -r1.2.2.1
--- UrlCreateAction.java 19 Feb 2009 12:09:01 -0000 1.2
+++ UrlCreateAction.java 18 Mar 2009 04:34:38 -0000 1.2.2.1
@@ -17,7 +17,7 @@
public class UrlCreateAction extends MMBaseAction {
private static final String ALL = "all";
- private static final String CREATION = "creation";
+ private static final String SESSION_CREATION = "creation";
@Override
public ActionForward execute(ActionMapping mapping, ActionForm form,
HttpServletRequest request,
@@ -33,7 +33,7 @@
if (parentchannel.equalsIgnoreCase(ALL) ||
StringUtils.isEmpty(parentchannel)) {
- parentchannel = (String) request.getSession().getAttribute(CREATION);
+ parentchannel = (String)
request.getSession().getAttribute(SESSION_CREATION);
}
NodeManager manager = cloud.getNodeManager("urls");
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
