cater for null group_by key in couch

dimagi · Aug 20, 2013 · 0ad1083 · dannyroberts · Aug 27, 2013 · snopoke
1 parent 8b745a9
commit 0ad1083
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/fluff/__init__.py b/fluff/__init__.py
@@ -366,7 +366,7 @@ def __init__(self, value):
                     elif isinstance(value, list):
                         self.value = dict(date=value[0], value=value[1], group_by=None)
 
-                    if not isinstance(self.value['date'], datetime.date):
+                    if self.value['date'] and not isinstance(self.value['date'], datetime.date):
                         self.value['date'] = datetime.datetime.strptime(self.value['date'], '%Y-%m-%d').date()
 
                 def __key(self):

diff --git a/fluff/_design/views/generic/map.js b/fluff/_design/views/generic/map.js
@@ -29,8 +29,9 @@ function (doc) {
                             for (i = 0; i < doc[calcName][emitterName].length; i++) {
                                 var value = doc[calcName][emitterName][i];
                                 if (typeOf(value) === 'object') {
-                                    var custom_key = value['group_by']
-                                    emit(custom_key.concat([calcName, emitterName, value['date']]), value['value']);
+                                    var custom_key = value['group_by'];
+                                    key = custom_key === null ? key : custom_key;
+                                    emit(key.concat([calcName, emitterName, value['date']]), value['value']);
                                 } else {
                                     emit(key.concat([calcName, emitterName, value[0]]), value[1]);
                                 }