diff options
author | Pavlos Ratis <dastergon@gentoo.org> | 2013-08-17 01:13:53 +0300 |
---|---|---|
committer | Pavlos Ratis <dastergon@gentoo.org> | 2013-08-17 01:13:53 +0300 |
commit | 581575c1b97de744ac320d5beb7faf2fe4238ef4 (patch) | |
tree | c95f38535f1742a51ed83988b2d6e0f0e1f41d1f /okupy/accounts | |
parent | Merge pull request #60 from tampakrap/discoverrunner (diff) | |
download | identity.gentoo.org-581575c1b97de744ac320d5beb7faf2fe4238ef4.tar.gz identity.gentoo.org-581575c1b97de744ac320d5beb7faf2fe4238ef4.tar.bz2 identity.gentoo.org-581575c1b97de744ac320d5beb7faf2fe4238ef4.zip |
improved dev lists view
Improved lists view by replacing class-based view to a more
flexible view suggested by tampakrap and mgorny.
Diffstat (limited to 'okupy/accounts')
-rw-r--r-- | okupy/accounts/urls.py | 6 | ||||
-rw-r--r-- | okupy/accounts/views.py | 22 |
2 files changed, 12 insertions, 16 deletions
diff --git a/okupy/accounts/urls.py b/okupy/accounts/urls.py index 91800b0..cf05c47 100644 --- a/okupy/accounts/urls.py +++ b/okupy/accounts/urls.py @@ -8,9 +8,9 @@ accounts_urlpatterns = patterns('', url(r'^login/$', v.login), url(r'^ssl-auth/$', v.ssl_auth), url(r'^logout/$', v.logout), - url(r'^devlist/$', v.DevListsView.as_view(template_name='devlist.html')), - url(r'^former-devlist/$', v.DevListsView.as_view(template_name='former-devlist.html')), - url(r'^foundation-members/$', v.DevListsView.as_view(template_name='foundation-members.html')), + url(r'^devlist/$', v.accounts_lists, {'acc_list': 'devlist'}), + url(r'^former-devlist/$', v.accounts_lists, {'acc_list': 'former-devlist'}), + url(r'^foundation-members/$', v.accounts_lists, {'acc_list': 'foundation-members'}), url(r'^signup/$', v.signup), url(r'^activate/(?P<token>[a-zA-Z0-9]+)/$', v.activate), url(r'^otp-setup/$', v.otp_setup), diff --git a/okupy/accounts/views.py b/okupy/accounts/views.py index 9b069b6..4746510 100644 --- a/okupy/accounts/views.py +++ b/okupy/accounts/views.py @@ -51,19 +51,15 @@ import qrcode logger = logging.getLogger('okupy') logger_mail = logging.getLogger('mail_okupy') - -class DevListsView(View): - template_name = '' - - def get(self, request, *args, **kwargs): - if 'devlist.html' in self.template_name: - devlist = LDAPUser.objects.filter(is_developer=True) - elif 'former-devlist.html' in self.template_name: - devlist = LDAPUser.objects.filter(is_retired=True) - elif 'foundation-members.html' in self.template_name: - devlist = LDAPUser.objects.filter(is_foundation=True) - return render(request, self.template_name, {'devlist': devlist}) - +def accounts_lists(request, acc_list): + devlist = LDAPUser.objects.all() + if acc_list == 'devlist': + devlist = devlist.filter(is_developer=True) + elif acc_list == 'former-devlist': + devlist = devlist.filter(is_retired=True) + elif acc_list == 'foundation-members': + devlist = devlist.filter(is_foundation=True) + return render(request, '%s.html' % acc_list, {'devlist': devlist}) @otp_required def index(request): |