Commit bb298a99 authored by Daniel W Bond's avatar Daniel W Bond
Browse files

didn't use guardian after all

parent abd383f0
...@@ -6,7 +6,6 @@ django-braces==1.4.0 ...@@ -6,7 +6,6 @@ django-braces==1.4.0
django-crispy-forms==1.4.0 django-crispy-forms==1.4.0
git+https://github.com/the-ben-waters/django-cas.git git+https://github.com/the-ben-waters/django-cas.git
django-gravatar2==1.1.4 django-gravatar2==1.1.4
django-guardian==1.2.5
django-localflavor==1.0 django-localflavor==1.0
django-model-utils==2.2 django-model-utils==2.2
oauthlib==0.7.2 oauthlib==0.7.2
......
...@@ -36,11 +36,6 @@ class Building(TimeStampedModel): ...@@ -36,11 +36,6 @@ class Building(TimeStampedModel):
slug = AutoSlugField(populate_from='name', unique=True) slug = AutoSlugField(populate_from='name', unique=True)
#class Meta:
# permissions = (
# ('view_task', 'View task'),
# )
def __str__(self): # __unicode__ on Python 2 def __str__(self): # __unicode__ on Python 2
return self.name return self.name
def __unicode__(self): # __unicode__ on Python 2 def __unicode__(self): # __unicode__ on Python 2
...@@ -52,11 +47,6 @@ class Floor(TimeStampedModel): ...@@ -52,11 +47,6 @@ class Floor(TimeStampedModel):
slug = AutoSlugField(populate_from='number') slug = AutoSlugField(populate_from='number')
#class Meta:
# permissions = (
# ('view_task', 'View task'),
# )
def __str__(self): # __unicode__ on Python 2 def __str__(self): # __unicode__ on Python 2
return self.building.__str__()+" "+self.number.__str__() return self.building.__str__()+" "+self.number.__str__()
......
...@@ -69,7 +69,6 @@ INSTALLED_APPS = ( ...@@ -69,7 +69,6 @@ INSTALLED_APPS = (
# packages # packages
'crispy_forms', 'crispy_forms',
'django_gravatar', 'django_gravatar',
'guardian',
'allauth', 'allauth',
'allauth.account', 'allauth.account',
'allauth.socialaccount', 'allauth.socialaccount',
...@@ -127,6 +126,8 @@ USE_L10N = True ...@@ -127,6 +126,8 @@ USE_L10N = True
USE_TZ = True USE_TZ = True
SITE_ID = 2
# Static files (CSS, JavaScript, Images) # Static files (CSS, JavaScript, Images)
# https://docs.djangoproject.com/en/1.7/howto/static-files/ # https://docs.djangoproject.com/en/1.7/howto/static-files/
...@@ -136,12 +137,9 @@ ACCOUNT_ADAPTER = 'accounts.adapter.AccountAdapter' ...@@ -136,12 +137,9 @@ ACCOUNT_ADAPTER = 'accounts.adapter.AccountAdapter'
AUTHENTICATION_BACKENDS = ( AUTHENTICATION_BACKENDS = (
'django.contrib.auth.backends.ModelBackend', 'django.contrib.auth.backends.ModelBackend',
'guardian.backends.ObjectPermissionBackend',
'cas.backends.CASBackend', 'cas.backends.CASBackend',
) )
ANONYMOUS_USER_ID = None
CAS_SERVER_URL = 'https://login.gmu.edu' CAS_SERVER_URL = 'https://login.gmu.edu'
CAS_LOGOUT_COMPLETELY = True CAS_LOGOUT_COMPLETELY = True
CAS_PROVIDE_URL_TO_LOGOUT = True CAS_PROVIDE_URL_TO_LOGOUT = True
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment