Correctly deal with counting paginated results from datanommer.

fedora-infra · Aug 3, 2013 · f3df5c9 · f3df5c9
1 parent cfd77ad
commit f3df5c9
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/fedbadges/rules.py b/fedbadges/rules.py
@@ -366,10 +366,13 @@ def construct_query(self, msg):
         kwargs = recursive_lambda_factory(kwargs, msg, name='msg')
         kwargs['defer'] = True
         total, pages, query = datanommer.models.Message.grep(**kwargs)
-        return query
+        return total, pages, query
 
     def matches(self, msg):
-        query = self.construct_query(msg)
-        operation = getattr(query, self._d['operation'])
-        result = operation()
+        total, pages, query = self.construct_query(msg)
+        if self._d['operation'] == 'count':
+            result = total
+        else:
+            operation = getattr(query, self._d['operation'])
+            result = operation()
         return self.condition(result)