Merge pull request #38 from edx-solutions/mattdrayer/group-name-fix2

Added null check for profile name

lms/djangoapps/api_manager/groups/tests.py

@@ -169,6 +169,11 @@ class GroupsApiTests(TestCase):
         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))
+        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):
         data = {'name': self.test_group_name}

lms/djangoapps/api_manager/groups/views.py

@@ -86,7 +86,7 @@ class GroupsList(APIView):
         for profile in profiles:
             item_data = {}
             item_data['group_id'] = profile.group_id
-            if len(profile.name):
+            if profile.name and len(profile.name):
                 group_name = profile.name
             else:
                 group = Group.objects.get(id=profile.group_id)