Changeset 1521 for trunk/src/groovy/dbnp

Timestamp:

Feb 14, 2011, 4:49:54 PM (10 years ago)

Author:

robert@…

Message:

Changes in samplesearch test related to #313

File:

• trunk/src/groovy/dbnp/query/SampleSearch.groovy (modified) (2 diffs)

trunk/src/groovy/dbnp/query/SampleSearch.groovy

@@ -76 +76 @@
                 def samples = []
                 if( getEntityCriteria( 'Study' ).size() > 0 ) {
-                        def studies = Study.findAll().findAll { it.canRead( this.user ) };
+                        def studies = Study.list()
+                        if( studies )
+                                studies = studies.findAll { it.canRead( this.user ) };
 
                         studies = filterStudiesOnStudyCriteria( studies );
@@ -98 +100 @@
                         });
                 } else {
-                        samples = Sample.findAll().findAll { it.parent?.canRead( this.user ) }
+                        samples = Sample.list()
+                        if( samples )
+                                samples = samples.findAll { it.parent?.canRead( this.user ) }
                 }