From f962134f1dba74594dacd25cf45c61fbd1f767e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Mon, 11 Jul 2016 08:55:13 +0200 Subject: [PATCH 1/3] general: add missing bits for working authentication (#12517) --- corbo/urls.py | 3 +++ corbo/views.py | 2 ++ 2 files changed, 5 insertions(+) diff --git a/corbo/urls.py b/corbo/urls.py index c5e91d8..227499f 100644 --- a/corbo/urls.py +++ b/corbo/urls.py @@ -26,5 +26,8 @@ urlpatterns = patterns('', url(r'^login/$', login, name='auth_login'), ) +if 'mellon' in settings.INSTALLED_APPS: + urlpatterns += patterns('', url(r'^accounts/mellon/', include('mellon.urls'))) + urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) urlpatterns += staticfiles_urlpatterns() diff --git a/corbo/views.py b/corbo/views.py index 5173a22..73109ab 100644 --- a/corbo/views.py +++ b/corbo/views.py @@ -1,4 +1,5 @@ from datetime import datetime +import urllib from django.conf import settings from django.core import signing @@ -6,6 +7,7 @@ from django.core.urlresolvers import reverse from django.views.generic import CreateView, UpdateView, DeleteView, \ ListView, TemplateView from django.contrib.syndication.views import Feed +from django.shortcuts import resolve_url from django.utils.feedgenerator import Atom1Feed from django.utils.http import urlencode from django.http import Http404 -- 2.8.1