From 0c7b3b9d623e9a6ecc3b0c287eb20378acf471eb Mon Sep 17 00:00:00 2001 From: smile Date: Wed, 25 Feb 2015 21:29:25 +0100 Subject: [PATCH] cey members can now also set a c-lab pin --- account/models.py | 1 + account/views.py | 3 ++- cbmi/settings.py | 5 +++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/account/models.py b/account/models.py index f1844fb..f15c1cf 100644 --- a/account/models.py +++ b/account/models.py @@ -38,6 +38,7 @@ class UserProfile(models.Model): is_ldap_admin = models.BooleanField(default=False, editable=False) is_circle_member = models.BooleanField(default=False, editable=False) is_clab_member = models.BooleanField(default=False, editable=False) + is_cey_member = models.BooleanField(default=False, editable=False) is_ceymaster = models.BooleanField(default=False, editable=False) def __unicode__(self): diff --git a/account/views.py b/account/views.py index 5864fbb..75d370c 100644 --- a/account/views.py +++ b/account/views.py @@ -151,7 +151,8 @@ def gastropin(request): @login_required def clabpin(request): - if not request.user.profile.is_clab_member: + if not (request.user.profile.is_clab_member or request.user.profile.is_cey_member): + #if not request.user.profile.is_clab_member: return render(request, 'access_denied.html') def calculate_clab_hash(pin): diff --git a/cbmi/settings.py b/cbmi/settings.py index c74ecf9..891077c 100644 --- a/cbmi/settings.py +++ b/cbmi/settings.py @@ -4,7 +4,7 @@ DEBUG = True TEMPLATE_DEBUG = DEBUG ADMINS = ( - ('Brian Wiborg', 'baccenfutter@c-base.org') + ('smile', 'smile@c-base.org') # ('Your Name', 'your_email@example.com'), ) @@ -68,7 +68,7 @@ STATICFILES_DIRS = ( # Put strings here, like "/home/html/static" or "C:/www/django/static". # Always use forward slashes, even on Windows. # Don't forget to use absolute paths, not relative paths. - '/home/baccenfutter/PycharmProjects/cbmi/static', + '/home/cbmi/cbmi/static', ) # List of finder classes that know how to find static files in @@ -143,6 +143,7 @@ AUTH_LDAP_PROFILE_FLAGS_BY_GROUP = { "is_ldap_admin": "cn=ldap_admins,ou=groups,dc=c-base,dc=org", "is_circle_member": "cn=circle,ou=groups,dc=c-base,dc=org", "is_clab_member": "cn=cey-c-lab,ou=groups,dc=c-base,dc=org", + "is_cey_member": "cn=cey-schleuse,ou=groups,dc=c-base,dc=org", "is_ceymaster": "cn=ceymaster,ou=groups,dc=c-base,dc=org", }