smile/cbmi
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cey members can now also set a c-lab pin

Browse source
This commit is contained in:
smile 2015-02-25 21:29:25 +01:00
parent c687310024
commit 0c7b3b9d62
3 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
account/models.py
View file

@ -38,6 +38,7 @@ class UserProfile(models.Model):
is_ldap_admin = models.BooleanField(default=False, editable=False) is_ldap_admin = models.BooleanField(default=False, editable=False)
is_circle_member = 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_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) is_ceymaster = models.BooleanField(default=False, editable=False)
def __unicode__(self): def __unicode__(self):

3
account/views.py
View file

@ -151,7 +151,8 @@ def gastropin(request):
@login_required @login_required
def clabpin(request): 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') return render(request, 'access_denied.html')
def calculate_clab_hash(pin): def calculate_clab_hash(pin):

5
cbmi/settings.py
View file

@ -4,7 +4,7 @@ DEBUG = True
TEMPLATE_DEBUG = DEBUG TEMPLATE_DEBUG = DEBUG
ADMINS = ( ADMINS = (
('Brian Wiborg', 'baccenfutter@c-base.org') ('smile', 'smile@c-base.org')
# ('Your Name', 'your_email@example.com'), # ('Your Name', 'your_email@example.com'),
) )
@ -68,7 +68,7 @@ STATICFILES_DIRS = (
# Put strings here, like "/home/html/static" or "C:/www/django/static". # Put strings here, like "/home/html/static" or "C:/www/django/static".
# Always use forward slashes, even on Windows. # Always use forward slashes, even on Windows.
# Don't forget to use absolute paths, not relative paths. # 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 # 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_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_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_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", "is_ceymaster": "cn=ceymaster,ou=groups,dc=c-base,dc=org",
} }