Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms
In directory
james.mmbase.org:/tmp/cvs-serv16143/java/com/finalist/cmsc/repository/forms
Modified Files:
AssetSearchAction.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.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- AssetSearchAction.java 23 Dec 2008 07:36:47 -0000 1.7
+++ AssetSearchAction.java 25 Dec 2008 01:56:32 -0000 1.8
@@ -67,15 +67,13 @@
String deleteAssetRequest = request.getParameter("deleteAssetRequest");
String show = request.getParameter("show");
- if (show == null) {
- show = searchForm.getShow();
+
+ if (StringUtils.isEmpty(show)) {
+ show = (String)request.getSession().getAttribute("show");
+ if(StringUtils.isEmpty(show)){
+ show="list";
}
- if (StringUtils.isNotEmpty(show)) {
- show = "thumbnail";
- }else{
- show = null;
}
-
if (StringUtils.isNotEmpty(deleteAssetRequest)) {
if (deleteAssetRequest.startsWith("massDelete:")) {
massDeleteAsset(deleteAssetRequest.substring(11));
@@ -101,7 +99,7 @@
}
}
addToRequest(request, "typesList", typesList);
- addToRequest(request, "show", show);
+ request.getSession().setAttribute("show", show);
// Switching tab, no searching.
if ("false".equalsIgnoreCase(searchForm.getSearch())) {
@@ -136,12 +134,12 @@
// set default order field
if (StringUtils.isEmpty(order)) {
+ if (nodeManager.hasField("number")) {
+ order = "number";
+ }
if (nodeManager.hasField("title")) {
order = "title";
}
- if (nodeManager.hasField("name")) {
- order = "name";
- }
}
if (StringUtils.isNotEmpty(order)) {
queryStringComposer.addParameter(ORDER, searchForm.getOrder());
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
