diff --git a/config/urls.py b/config/urls.py index a7b910d..7fa9b03 100644 --- a/config/urls.py +++ b/config/urls.py @@ -56,6 +56,7 @@ urlpatterns = [ # need to be logged in for these urls url(r'^members/$', MemberListView.as_view(), name='members'), + url(r'^members/(?P[a-zA-Z]+)/$', MemberListView.as_view(), name='members_status'), # Django Admin, use {% url 'admin:index' %} url(r'{}'.format(settings.ADMIN_URL), admin.site.urls), diff --git a/mhackspace/members/views.py b/mhackspace/members/views.py index 4518a32..a63a0ca 100644 --- a/mhackspace/members/views.py +++ b/mhackspace/members/views.py @@ -1,13 +1,13 @@ # -*- coding: utf-8 -*- from __future__ import absolute_import, unicode_literals -from django.core.urlresolvers import reverse -from django.views.generic import DetailView, ListView, RedirectView, UpdateView +from django.views.generic import ListView from django.contrib.auth.mixins import LoginRequiredMixin from mhackspace.users.models import User + class MemberListView(LoginRequiredMixin, ListView): template_name = 'pages/members.html' queryset = User.objects.prefetch_related('user', 'groups') @@ -15,6 +15,10 @@ class MemberListView(LoginRequiredMixin, ListView): def get_context_data(self, **kwargs): context = super(MemberListView, self).get_context_data(**kwargs) - context['members'] = self.get_queryset() - context['total'] = self.get_queryset().filter(groups__name='members').count() + if self.kwargs.get('status') == 'registered': + context['members'] = self.get_queryset().filter(groups__name='members') + else: + context['members'] = self.get_queryset() + context['total_users'] = self.get_queryset().count() + context['total_members'] = self.get_queryset().filter(groups__name='members').count() return context diff --git a/mhackspace/templates/pages/members.html b/mhackspace/templates/pages/members.html index d11dd0a..ae85445 100644 --- a/mhackspace/templates/pages/members.html +++ b/mhackspace/templates/pages/members.html @@ -7,10 +7,12 @@