Changeset 1483


Ignore:
Timestamp:
Feb 3, 2011, 10:02:15 AM (6 years ago)
Author:
t.w.abma@…
Message:
  • fixed Search (code was committed with merge conflict messages in the source)
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/groovy/dbnp/query/Search.groovy

    r1482 r1483  
    1616package dbnp.query
    1717
    18 import dbnp.authentication.SecUser
    19 import groovy.lang.Closure;
    20 
     18import nl.grails.plugins.gdt.*
     19import java.util.List;
     20import java.text.DateFormat;
    2121import java.text.SimpleDateFormat
    2222import java.util.List;
     
    2525import org.springframework.web.context.request.RequestContextHolder;
    2626import org.codehaus.groovy.grails.commons.ApplicationHolder;
     27
     28import dbnp.authentication.*
    2729
    2830import org.dbnp.gdt.*
     
    4749        public void setResultFields( Map r ) { resultFields = r; }
    4850
    49 <<<<<<< .mine
    50         public Search() {
    51                 ApplicationContext ctx = (ApplicationContext)ApplicationHolder.getApplication().getMainContext();
    52                 def authenticationService = ctx.getBean("authenticationService");
    53                 def sessionUser = authenticationService.getLoggedInUser();
    54                
    55                 if( sessionUser )
    56                         this.user = sessionUser;
    57                 else
    58                         this.user = null
    59         }
    60        
    61 =======
    62 >>>>>>> .r1481
    6351        /**
    6452         * Returns the number of results found by this search
Note: See TracChangeset for help on using the changeset viewer.