Commit 7cdcf137 by Matt Drayer

Added null check for profile name

parent 8a5904f6
...@@ -169,6 +169,11 @@ class GroupsApiTests(TestCase): ...@@ -169,6 +169,11 @@ class GroupsApiTests(TestCase):
response = self.do_get(self.base_groups_uri) response = self.do_get(self.base_groups_uri)
self.assertEqual(response.status_code, 200) self.assertEqual(response.status_code, 200)
self.assertEqual(response.data[0]['name'], '{:04d}: {}'.format(group_id, self.test_group_name)) self.assertEqual(response.data[0]['name'], '{:04d}: {}'.format(group_id, self.test_group_name))
profile.name = None
profile.save()
response = self.do_get(self.base_groups_uri)
self.assertEqual(response.status_code, 200)
self.assertEqual(response.data[0]['name'], '{:04d}: {}'.format(group_id, self.test_group_name))
def test_group_detail_get(self): def test_group_detail_get(self):
data = {'name': self.test_group_name} data = {'name': self.test_group_name}
......
...@@ -86,7 +86,7 @@ class GroupsList(APIView): ...@@ -86,7 +86,7 @@ class GroupsList(APIView):
for profile in profiles: for profile in profiles:
item_data = {} item_data = {}
item_data['group_id'] = profile.group_id item_data['group_id'] = profile.group_id
if len(profile.name): if profile.name and len(profile.name):
group_name = profile.name group_name = profile.name
else: else:
group = Group.objects.get(id=profile.group_id) group = Group.objects.get(id=profile.group_id)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment