Gitlab CSE Unil

Commit 2c50efc4 authored by Julien Furrer's avatar Julien Furrer
Browse files

Merge branch 'dev' of...

Merge branch 'dev' of pcpol200-3:/Users/jfurrer/JOB/___RISET/PROJECTS/Misc/AnnotationDImage/workspace/adim.django into dev
parents b3ab0628 6bf410a2
empty empty
\ No newline at end of file
......@@ -164,16 +164,6 @@ REST_FRAMEWORK = {
}
# ..... SHIBAUTH
LOCAL_APPS += ('shibauth', )
AUTHENTICATION_BACKENDS = ('shibauth.shibbolethbackends.ShibbolethBackend',) + AUTHENTICATION_BACKENDS
try:
from .components.shibbauth import *
except ImportError:
raise ImproperlyConfigured("Unable to import SHIBAUTH configurations")
# ..... CORS HEADERS (https://github.com/ottoyiu/django-cors-headers/)
LOCAL_APPS += ('corsheaders',)
MIDDLEWARE_CLASSES = list(MIDDLEWARE_CLASSES)
......@@ -252,6 +242,16 @@ ATTP = {
}
}
# ..... SHIBAUTH
LOCAL_APPS += ('shibauth', )
AUTHENTICATION_BACKENDS = ('shibauth.shibbolethbackends.ShibbolethBackend',) + AUTHENTICATION_BACKENDS
try:
from .components.shibbauth import *
except ImportError:
raise ImproperlyConfigured("Unable to import SHIBAUTH configurations")
# ---------- END LOCAL APPS CONFIGURATION
......
......@@ -50,4 +50,4 @@ def validate(request):
# session_key = "anobj_{}".format(anobj.uuid[:12])
# request.session[session_key] = attp_anobj.get('status')
return HttpResponseRedirect(reverse("adim_app:annotate", kwargs={'anobj_uuid': attp_anobj.get('id')}))
\ No newline at end of file
return HttpResponseRedirect(reverse("adim_app:annotate", kwargs={'anobj_uuid': attp_anobj.get('id')}))
Supports Markdown
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