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

[kevinshen]

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

Modified Files:
        ContentAction.java SearchAction.java 
Log Message:
CMSC-280,Contentchannel screen does not give as much sort options as in 
searching in the library


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-280


Index: ContentAction.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/ContentAction.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- ContentAction.java  10 May 2008 16:31:23 -0000      1.8
+++ ContentAction.java  4 Jun 2008 05:18:09 -0000       1.9
@@ -26,7 +26,7 @@
 import com.finalist.cmsc.struts.MMBaseAction;
 
 public class ContentAction extends MMBaseAction {
-
+   private static boolean flag;
    @Override
    public ActionForward execute(ActionMapping mapping, ActionForm form, 
HttpServletRequest request,
          HttpServletResponse response, Cloud cloud) throws Exception {
@@ -51,7 +51,14 @@
          orderby = null;
       }
       if (StringUtils.isEmpty(direction)) {
-         direction = null;
+         if(flag==true){
+                 direction="down";
+                 flag=false;
+         }else{
+                 direction="up";
+                 flag=true;
+         }
+         //direction = null;
       }
 
       // Set the offset (used for paging).
@@ -85,7 +92,6 @@
          }
          addToRequest(request, "createdNumbers", createdNumbers);
       }
-
       return mapping.findForward(SUCCESS);
    }
 


Index: SearchAction.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SearchAction.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- SearchAction.java   16 May 2008 11:46:36 -0000      1.14
+++ SearchAction.java   4 Jun 2008 05:18:09 -0000       1.15
@@ -124,7 +124,7 @@
                 order = "name";
             }
         }
-        if (StringUtils.isEmpty(order)) {
+        if (StringUtils.isNotEmpty(order)) {
             queryStringComposer.addParameter(ORDER, searchForm.getOrder());
             queryStringComposer.addParameter(DIRECTION, "" + 
searchForm.getDirection());
             
query.addSortOrder(query.getStepField(nodeManager.getField(order)), 
searchForm.getDirection());
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs