[MMBASE CVS] contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms AssetAction.java

[mfang]

Update of 
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms
In directory 
james.mmbase.org:/tmp/cvs-serv26247/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms

Modified Files:
        AssetAction.java 
Log Message:
CMSC-681 Asset Maintenance  Thumbnail view is not remembered


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: AssetAction.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/AssetAction.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- AssetAction.java    16 Dec 2008 07:55:46 -0000      1.7
+++ AssetAction.java    23 Dec 2008 10:11:18 -0000      1.8
@@ -65,20 +65,23 @@
       String exist = request.getParameter("exist");
       String imageOnly = request.getParameter("imageOnly");
 
-      if (StringUtils.isNotEmpty(show)) {
-         show = "thumbnail";
-      } else {
-         show = null;
-      }
-      if (StringUtils.isEmpty(imageOnly)) {
-         imageOnly = "no";
-      }
       if (StringUtils.isEmpty(orderby)) {
          orderby = null;
       }
       if (StringUtils.isEmpty(direction)) {
          direction = null;
-
+      }
+      if (StringUtils.isEmpty(show)) {
+         show = (String)request.getSession().getAttribute("show");
+         if(StringUtils.isEmpty(show)){
+            show="list";
+         } 
+      }
+      if (StringUtils.isEmpty(imageOnly)) {
+         imageOnly = (String)request.getSession().getAttribute("imageOnly");
+         if(StringUtils.isEmpty(imageOnly)){
+            imageOnly="no";
+         } 
       }
 
       // Set the offset (used for paging).
@@ -117,9 +120,9 @@
          addToRequest(request, "orderby", orderby);
          addToRequest(request, "elements", assets);
          addToRequest(request, "elementCount", Integer.toString(assetCount));
-         addToRequest(request, "show", show);
          addToRequest(request, "exist", exist);
-         addToRequest(request, "imageOnly", imageOnly);
+         request.getSession().setAttribute("show", show);
+         request.getSession().setAttribute("imageOnly", imageOnly);
 
          Map<String, Node> createdNumbers = new HashMap<String, Node>();
          for (Iterator<Node> iter = created.iterator(); iter.hasNext();) {
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs