Changeset 1623

Timestamp:

Mar 11, 2011, 12:40:10 PM (9 years ago)

Author:

work@…

Message:

• resolves #354

File:

• trunk/grails-app/domain/dbnp/studycapturing/Study.groovy (modified) (15 diffs)

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

@@ -456 +456 @@
                 // Administrators are allowed to read everything
                 if (user.hasAdminRights()) {
-                        return c.list {
+                        return c.listDistinct {
                                 maxResults(max)
                                 order("title", "asc")
@@ -463 +463 @@
                 }
 
-                return c.list {
+                return c.listDistinct {
                         maxResults(max)
                         order("title", "asc")
@@ -483 +483 @@
                 // Administrators are allowed to read everything
                 if (user == null) {
-                        return c.list {
+                        return c.listDistinct {
                                 maxResults(max)
                                 firstResult(offset)
@@ -493 +493 @@
                         }.unique()
                 } else if (user.hasAdminRights()) {
-                        return c.list {
+                        return c.listDistinct {
                                 maxResults(max)
                                 firstResult(offset)
@@ -499 +499 @@
                         }.unique()
                 } else {
-                        return c.list {
+                        return c.listDistinct {
                                 maxResults(max)
                                 firstResult(offset)
@@ -529 +529 @@
                 if (user == null) {
                         // regular user
-                        return c.list {
+                        return c.listDistinct {
                                 or {
                                         ilike("title", "%${query}%")
@@ -541 +541 @@
                 } else if (user.hasAdminRights()) {
                         // admin can search everything
-                        return c.list {
+                        return c.listDistinct {
                                 or {
                                         ilike("title", "%${query}%")
@@ -548 +548 @@
                         }
                 } else {
-                        return c.list {
+                        return c.listDistinct {
                                 or {
                                         ilike("title", "%${query}%")
@@ -579 +579 @@
         public static countPublicStudies(boolean published) {
                 def c = Study.createCriteria()
-                return c.count {
+                return (c.listDistinct {
                         and {
                                 eq("published", published)
                                 eq("publicstudy", true)
                         }
-                }
+                }).size()
         }
 
@@ -594 +594 @@
         public static countPrivateStudies(boolean published) {
                 def c = Study.createCriteria()
-                return c.count {
+                return (c.listDistinct {
                         and {
                                 eq("publicstudy", false)
@@ -602 +602 @@
                                 eq("publicstudy", true)
                         }
-                }
+                }).size()
         }
 
@@ -623 +623 @@
                         return Study.count()
                 } else {
-                        return c.count {
+                        return (c.listDistinct {
                                 or {
                                         eq("owner", user)
@@ -636 +636 @@
                                         }
                                 }
-                        }
+                        }).size()
                 }
         }
@@ -652 +652 @@
                         return Study.count()
                 } else {
-                        return c.count {
+                        return (c.listDistinct {
                                 or {
                                         eq("owner", user)
@@ -659 +659 @@
                                         }
                                 }
-                        }
+                        }).size()
                 }
         }