Changeset 1222 for trunk/grails-app/controllers/dbnp/exporter/ExporterController.groovy

Timestamp:

Nov 30, 2010, 2:10:42 PM (12 years ago)

Author:

robert@…

Message:

Implemented improved authorisation to give administrators all permissions (ticket #207)

File:

• trunk/grails-app/controllers/dbnp/exporter/ExporterController.groovy (modified) (1 diff)

trunk/grails-app/controllers/dbnp/exporter/ExporterController.groovy

@@ -45 +45 @@
         def c = dbnp.studycapturing.Study.createCriteria()
 
-        def studies
-        if( user == null ) {
-            studies = c.list {
-                maxResults(max)
-                and {
-                    eq( "published", true )
-                    eq( "publicstudy", true )
-                }
-            }
-        } 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 studies = Study.giveReadableStudies(user, max);
         [studyInstanceList: studies, studyInstanceTotal: studies.count()]
     }