Merge pull request #472 from onaio/441-performance

441 performance
onaio · Aug 4, 2014 · e5fd268 · e5fd268
2 parents 914a290 + 95a9e52
commit e5fd268
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/onadata/libs/permissions.py b/onadata/libs/permissions.py
@@ -162,11 +162,14 @@ def get_object_users_with_permissions(obj):
     """Returns users, roles and permissions for a object.
     """
     users_with_perms = []
+
     if obj:
         users_with_perms = [{
             'user': user,
             'role': get_role(permissions, obj),
             'permissions': permissions} for user, permissions in
-            get_users_with_perms(obj, attach_perms=True).items()]
+            get_users_with_perms(obj,
+                                 attach_perms=True,
+                                 with_group_users=False).items()]
 
     return users_with_perms
diff --git a/onadata/libs/serializers/tag_list_serializer.py b/onadata/libs/serializers/tag_list_serializer.py
@@ -7,12 +7,14 @@ class TagListSerializer(serializers.WritableField):
     def from_native(self, data):
         if type(data) is not list:
             raise ParseError("expected a list of data")
+
         return data
 
     def to_native(self, obj):
         if obj is None:
             return super(TagListSerializer, self).to_native(obj)
 
         if type(obj) is not list:
-            return [tag.name for tag in obj.all()]
+            return list(obj.values_list('name', flat=True))
+
         return obj