cvs commit: corporate_portal_templates/src/view/jsp/include filters.inc

[Khue Nguyen]

knguyen     2004/09/30 16:16:09 CEST

  Modified files:
    src/view/jsp/include filters.inc 
  Log:
  - complete missing directoryProjectSearch and number Filtering on lastmodifdate
  
  Revision  Changes    Path
  1.6       +12 -1     corporate_portal_templates/src/view/jsp/include/filters.inc
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/filters.inc.diff?r1=1.5&r2=1.6&f=h
  
  
  
  Index: filters.inc
  ===================================================================
  RCS file: 
/home/cvs/repository/corporate_portal_templates/src/view/jsp/include/filters.inc,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- filters.inc       28 Sep 2004 09:25:22 -0000      1.5
  +++ filters.inc       30 Sep 2004 14:16:09 -0000      1.6
  @@ -463,8 +463,10 @@
   
        // create the sort handler for the container list "directoryProjectContainer"
        if ( docSort != null && !docSort.equals("none") ){
  +             boolean numberFiltering = 
("metaDataLastModificationDate".equals(docSort));
  +
                ContainerSorterByContainerDefinition sorter =
  -                     new 
ContainerSorterByContainerDefinition(-1,docSort,"directoryDocContainer",jParams.getEntryLoadRequest(),false);
  +                     new 
ContainerSorterByContainerDefinition(-1,docSort,"directoryDocContainer",jParams.getEntryLoadRequest(),numberFiltering);
                if ( !docSortOrder.equals("asc") ){
                        sorter.setDescOrdering();
                }
  @@ -519,6 +521,15 @@
        //-----------------------------------------------------------
        // Create the filter handler for the container list "directoryProjectContainer"
        //-----------------------------------------------------------
  +
  +     searchQuery = 
request.getParameter(JahiaSearchConstant.CLIST_SEARCHQUERY_INPUT_PREFIX + 
"directoryProjectContainer");
  +     if (searchQuery != null && !"".equals(searchQuery.trim()) ){
  +             ContainerSearcher cSearcher =
  +             new ContainerSearcher("directoryProjectContainer",jParams,
  +             searchQuery,jParams.getEntryLoadRequest());
  +             
request.setAttribute("directoryProjectContainer_search_handler",cSearcher);
  +     }
  +     
        if ( cFilterBeans.size()>0 )
        {
                ContainerFilters containerFilters = new 
ContainerFilters("directoryProjectContainer",jParams,cFilterBeans);