Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms
In directory
james.mmbase.org:/tmp/cvs-serv31769/java/com/finalist/cmsc/repository/forms
Modified Files:
AssetSearchAction.java AssetSearchForm.java
AssetSearchInitAction.java
Log Message:
CMSC-681 Asset Maintenance code refacted
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-681
Index: AssetSearchAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/AssetSearchAction.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- AssetSearchAction.java 25 Dec 2008 01:56:32 -0000 1.8
+++ AssetSearchAction.java 25 Dec 2008 05:40:55 -0000 1.9
@@ -66,12 +66,12 @@
AssetSearchForm searchForm = (AssetSearchForm) form;
String deleteAssetRequest = request.getParameter("deleteAssetRequest");
- String show = request.getParameter("show");
+ String searchShow = request.getParameter("searchShow");
- if (StringUtils.isEmpty(show)) {
- show = (String)request.getSession().getAttribute("show");
- if(StringUtils.isEmpty(show)){
- show="list";
+ if (StringUtils.isEmpty(searchShow)) {
+ searchShow = (String)request.getSession().getAttribute("searchShow");
+ if(StringUtils.isEmpty(searchShow)){
+ searchShow="list";
}
}
if (StringUtils.isNotEmpty(deleteAssetRequest)) {
@@ -99,7 +99,7 @@
}
}
addToRequest(request, "typesList", typesList);
- request.getSession().setAttribute("show", show);
+ request.getSession().setAttribute("searchShow", searchShow);
// Switching tab, no searching.
if ("false".equalsIgnoreCase(searchForm.getSearch())) {
@@ -251,7 +251,7 @@
// Set everything on the request.
searchForm.setResultCount(resultCount);
searchForm.setResults(results);
- request.setAttribute(GETURL,
queryStringComposer.getQueryString()+((show==null)?"":"&show="+show));
+ request.setAttribute(GETURL,
queryStringComposer.getQueryString()+((searchShow==null)?"":"&searchShow="+searchShow));
return super.execute(mapping, form, request, response, cloud);
}
Index: AssetSearchForm.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/AssetSearchForm.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- AssetSearchForm.java 12 Dec 2008 11:00:56 -0000 1.4
+++ AssetSearchForm.java 25 Dec 2008 05:40:55 -0000 1.5
@@ -18,7 +18,7 @@
private String mode = "basic";
private String search = "true";
private String parentchannelpath = "";
- private String show = "";
+ private String searchShow = "list";
public String getAssettypes() {
return assettypes;
@@ -125,10 +125,10 @@
}
public void setShow(String show) {
- this.show = show;
+ this.searchShow = show;
}
public String getShow() {
- return show;
+ return searchShow;
}
}
Index: AssetSearchInitAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/AssetSearchInitAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- AssetSearchInitAction.java 23 Dec 2008 10:11:37 -0000 1.2
+++ AssetSearchInitAction.java 25 Dec 2008 05:40:55 -0000 1.3
@@ -56,9 +56,6 @@
}
}
addToRequest(request, "typesList", typesList);
- //reset the show mode of assets in the session if exist
- request.getSession().removeAttribute("show");
- request.getSession().removeAttribute("imageOnly");
return mapping.findForward("searchoptions");
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
