Changeset 1092

Timestamp:

Nov 5, 2010, 9:02:01 PM (12 years ago)

Author:

m.s.vanvliet@…

Message:

Pilot is user-aware adds a memu item Pilot

Location:

trunk/grails-app

Files:

• controllers/nmc/PilotController.groovy (modified) (1 diff)
• views/common/_topnav.gsp (modified) (1 diff)

trunk/grails-app/controllers/nmc/PilotController.groovy

@@ -39 +39 @@
     def index = {
                 
+                session.pilot = true
+                
+                def user = authenticationService.getLoggedInUser()
+                def max = Math.min(params.max ? params.int('max') : 10, 100)
+
+                def c = Study.createCriteria()
+
+                def studies
+                if( user == null ) {
+                        //login and return here...
+                        redirect(controller:"login", action:"auth")
+                        return false
+                        
+                } else {
+                        studies = c.list {
+                                maxResults(max)
+                                or {
+                                        eq( "owner", user )
+                                        writers {
+                                                eq( "id", user.id )
+                                        }
+                                        and {
+                                                readers {
+                                                        eq( "id", user.id )
+                                                }
+                                                eq( "published", true )
+                                        }
+                                }
+                        }
+                }
+                
                 def studyInstance = new Study()
                 studyInstance.properties = params
                 
-                [studyInstanceList: Study.list(params), studyInstance: studyInstance]
+                [studyInstanceList: studies, studyInstance: studyInstance]
     }
 

trunk/grails-app/views/common/_topnav.gsp

@@ -60 +60 @@
                 </li>
         </g:if>
+        <g:if test="${session.pilot == true}">
+                <li><g:link controller="pilot" action="index">Pilot</g:link></li>
+        </g:if> 
 </ul>
 <!-- /TOPNAV //-->