# HG changeset patch
# User Raimund Renkert <rrenkert@intevation.de>
# Date 1371211690 -7200
# Node ID 631177f92323eaa6725a7c231a2decfdddd2733c
# Parent  2dd2c36a3b32fa0e60233855c9c34ee1dba028bf
Fixed filter for LProbe and LMessung.

diff -r 2dd2c36a3b32 -r 631177f92323 src/main/java/de/intevation/lada/data/LMesswertRepository.java
--- a/src/main/java/de/intevation/lada/data/LMesswertRepository.java	Fri Jun 14 10:38:28 2013 +0200
+++ b/src/main/java/de/intevation/lada/data/LMesswertRepository.java	Fri Jun 14 14:08:10 2013 +0200
@@ -116,7 +116,8 @@
             andFilter.add(cb.equal(member.get("messungsId"), filter.get("messung")));
         }
         criteria.distinct(true);
-        criteria.where(andFilter.toArray(new Predicate[andFilter.size()]));
+        Predicate ap = cb.and(andFilter.toArray(new Predicate[andFilter.size()]));
+        criteria.where(ap);
         List<LMesswert> result = filter(criteria);
         return new Response(true, 200, result);
     }
diff -r 2dd2c36a3b32 -r 631177f92323 src/main/java/de/intevation/lada/data/LProbeRepository.java
--- a/src/main/java/de/intevation/lada/data/LProbeRepository.java	Fri Jun 14 10:38:28 2013 +0200
+++ b/src/main/java/de/intevation/lada/data/LProbeRepository.java	Fri Jun 14 14:08:10 2013 +0200
@@ -99,7 +99,8 @@
             }
         }
         criteria.distinct(true);
-        criteria.where(andFilter.toArray(new Predicate[andFilter.size()]));
+        Predicate af = cb.and(andFilter.toArray(new Predicate[andFilter.size()]));
+        criteria.where(af);
         List<LProbeInfo> result = filter(criteria);
         return new Response(true, 200, result);
     }