Changeset 1724

Timestamp:

Apr 7, 2011, 2:50:12 PM (12 years ago)

Author:

s.h.sikkema@…

Message:

changed Study.give[Readable,Writable]Studies to make max parameter optional; assay exporter now gives all readable studies instead of all owned studies

Location:

trunk/grails-app

Files:

• controllers/dbnp/studycapturing/AssayController.groovy (modified) (1 diff)
• domain/dbnp/studycapturing/Study.groovy (modified) (7 diffs)

trunk/grails-app/controllers/dbnp/studycapturing/AssayController.groovy

@@ -123 +123 @@
             action{
                 def user            = authenticationService.getLoggedInUser()
-                flow.userStudies    = Study.findAllByOwner(user)
+                flow.userStudies    = Study.giveReadableStudies(user)
             }
             on("success").to "selectAssay"

trunk/grails-app/domain/dbnp/studycapturing/Study.groovy

@@ -449 +449 @@
          * Returns a list of studies that are writable for the given user
          */
-        public static giveWritableStudies(SecUser user, int max) {
+        public static giveWritableStudies(SecUser user, int max = null) {
                 // User that are not logged in, are not allowed to write to a study
                 if (user == null)
@@ -459 +459 @@
                 if (user.hasAdminRights()) {
                         return c.listDistinct {
-                                maxResults(max)
+                                if (max != null) maxResults(max)
                                 order("title", "asc")
                                 
@@ -466 +466 @@
 
                 return c.listDistinct {
-                        maxResults(max)
+                        if (max != null) maxResults(max)
                         order("title", "asc")
                         or {
@@ -480 +480 @@
          * Returns a list of studies that are readable by the given user
          */
-        public static giveReadableStudies(SecUser user, int max, int offset = 0) {
+        public static giveReadableStudies(SecUser user, int max = null, int offset = 0) {
                 def c = Study.createCriteria()
 
@@ -486 +486 @@
                 if (user == null) {
                         return c.listDistinct {
-                                maxResults(max)
+                                if (max != null) maxResults(max)
                                 firstResult(offset)
                                 order("title", "asc")
@@ -496 +496 @@
                 } else if (user.hasAdminRights()) {
                         return c.listDistinct {
-                                maxResults(max)
+                                if (max != null) maxResults(max)
                                 firstResult(offset)
                                 order("title", "asc")
@@ -502 +502 @@
                 } else {
                         return c.listDistinct {
-                                maxResults(max)
+                                if (max != null) maxResults(max)
                                 firstResult(offset)
                                 order("title", "asc")