Merge pull request #1580 from akatsoulas/1331591-curator-view

[fix bug 1331591] Filter membership status for closed groups.
mozilla · Jan 25, 2017 · 35ea5cc · 35ea5cc
2 parents e4f6618 + 2ca794f
commit 35ea5cc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/mozillians/groups/tests/test_views/test_show.py b/mozillians/groups/tests/test_views/test_show.py
@@ -331,7 +331,7 @@ def test_show_filter_accepting_new_members_no(self):
         with self.login(self.user_1) as client:
             response = client.get(self.url, follow=True)
         ok_('membership_filter_form' in response.context)
-        eq_(response.context['membership_filter_form'], None)
+        ok_(response.context['membership_filter_form'])
 
     def test_show_filter_accepting_new_members_yes(self):
         self.group.curators.add(self.user_1.userprofile)

diff --git a/mozillians/groups/views.py b/mozillians/groups/views.py
@@ -148,7 +148,8 @@ def show(request, url, alias_model, template):
         is_curator = is_manager or (request.user.userprofile in group.curators.all())
 
         # initialize the form only when the group is moderated and user is curator of the group
-        if is_curator and group.accepting_new_members == 'by_request':
+        if (is_curator and (group.accepting_new_members == Group.REVIEWED or
+                            group.accepting_new_members == Group.CLOSED)):
             membership_filter_form = forms.MembershipFilterForm(request.GET)
         else:
             membership_filter_form = None
@@ -185,7 +186,7 @@ def show(request, url, alias_model, template):
         count_skills = defaultdict(int)
         for skill_id in shared_skill_ids:
             count_skills[skill_id] += 1
-        common_skills_ids = [k for k, v in sorted(count_skills.items(),
+        common_skills_ids = [k for k, _ in sorted(count_skills.items(),
                                                   key=lambda x: x[1],
                                                   reverse=True)
                              if count_skills[k] > 1]
@@ -347,15 +348,15 @@ def join_group(request, url):
         messages.error(request, _('You are already in this group.'))
     elif group.has_pending_member(profile_to_add):
         messages.error(request, _('Your request to join this group is still pending.'))
-    elif group.accepting_new_members == 'no':
+    elif group.accepting_new_members == Group.CLOSED:
         messages.error(request, _('This group is not accepting requests to join.'))
     else:
-        if group.accepting_new_members == 'yes':
+        if group.accepting_new_members == Group.OPEN:
             status = GroupMembership.MEMBER
             messages.info(request, _('You have been added to this group.'))
             if group.terms:
                 status = GroupMembership.PENDING_TERMS
-        elif group.accepting_new_members == 'by_request':
+        elif group.accepting_new_members == Group.REVIEWED:
             status = GroupMembership.PENDING
             messages.info(request, _('Your membership request has been sent '
                                      'to the group curator(s).'))