Merge branch 'dev' of github.com:hmarr/mongoengine into dev

2011-12-02 06:04:12 -08:00 · 2011-12-02 06:04:12 -08:00 · 9f1196e982
commit 9f1196e982
parent 6419a8d09a 769cee3d64
1 changed files with 3 additions and 1 deletions
--- a/mongoengine/queryset.py
+++ b/mongoengine/queryset.py
@ -1572,8 +1572,10 @@ class QuerySet(object):
                    field.forEach(function(item) {
                        emit(item, 1);
                    });
-                } else {
+                } else if (field) {
                    emit(field, 1);
+                } else {
+                    emit(null, 1);
                }
            }
        """ % dict(field=field)