Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms
In directory
james.mmbase.org:/tmp/cvs-serv17072/java/com/finalist/cmsc/repository/forms
Modified Files:
AssetSearchAction.java ContentSearchAction.java
Log Message:
CMSC-1266 Assets: Keep search text while swapping between content search and
assetsearch
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-1266
Index: AssetSearchAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/AssetSearchAction.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- AssetSearchAction.java 5 Jan 2009 01:50:50 -0000 1.13
+++ AssetSearchAction.java 3 Feb 2009 07:09:09 -0000 1.14
@@ -73,6 +73,7 @@
if (StringUtils.isNotEmpty(strict)) {
request.setAttribute(STRICT, strict);
}
+ request.getSession().setAttribute("title", searchForm.getTitle());
if (StringUtils.isEmpty(searchShow)) {
searchShow = (String)request.getSession().getAttribute("searchShow");
if(StringUtils.isEmpty(searchShow)){
Index: ContentSearchAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/ContentSearchAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- ContentSearchAction.java 30 Dec 2008 11:13:59 -0000 1.5
+++ ContentSearchAction.java 3 Feb 2009 07:09:09 -0000 1.6
@@ -61,6 +61,7 @@
index = "no";
}
request.setAttribute("index", index);
+ request.getSession().setAttribute("title", searchForm.getTitle());
if (StringUtils.isNotEmpty(deleteContentRequest)) {
if (deleteContentRequest.startsWith("massDelete:")) {
massDeleteContent(deleteContentRequest.substring(11));
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
