add django-registration, and required to be logged in for the emissions views

diff --git a/panikdb/settings.py b/panikdb/settings.py
index 6d64e8d46e10a850d9cc2cb0ed7f4cd26614fcac..b328d2979b849e60ff991c33babb9a8ec878270b 100644 (file)
--- a/panikdb/settings.py
+++ b/panikdb/settings.py
@@ -176,6 +176,8 @@ HAYSTACK_CONNECTIONS = {
     },
 }
 
+LOGIN_REDIRECT_URL = '/'
+
 try:
     from local_settings import *
 except ImportError:

diff --git a/panikdb/templates/registration/login.html b/panikdb/templates/registration/login.html
new file mode 100644 (file)
index 0000000..fe60c4a
--- /dev/null
+++ b/panikdb/templates/registration/login.html
@@ -0,0 +1,28 @@
+{% extends "panikdb/base.html" %}
+{% load url from future %}
+
+{% block content %}
+
+<h2>Connexion</h2>
+
+{% if form.errors %}
+<p>Mot de passe incorrect. Essayez encore.</p>
+{% endif %}
+
+<form method="post" id="login-form" action="{% url 'django.contrib.auth.views.login' %}">
+{% csrf_token %}
+
+<p>
+  <label for="id_username">Identifiant</label>
+  {{ form.username }}
+</p>
+<p>
+  <label for="id_password">Mot de passe</label>
+  {{ form.password }}
+</p>
+
+<input type="submit" value="Se connecter" class="submit login" />
+<input type="hidden" name="next" value="{{ next }}" />
+</form>
+
+{% endblock %}

diff --git a/panikdb/urls.py b/panikdb/urls.py
index 467c4c812b8e2f77518ea3e7d20262f066459455..44f8ec7794c23d70b59c785410c1d61f7f799910 100644 (file)
--- a/panikdb/urls.py
+++ b/panikdb/urls.py
@@ -2,6 +2,7 @@ from django.conf.urls import patterns, include, url
 from django.conf import settings
 from django.views.generic import RedirectView
 from django.core.urlresolvers import reverse_lazy
+from django.contrib.auth.decorators import login_required
 
 from django.contrib import admin
 admin.autodiscover()
@@ -11,6 +12,10 @@ from haystack.forms import FacetedSearchForm
 from haystack.query import SearchQuerySet
 
 from emissions.views import FacetedSearchView
+from .emissions.urls import urlpatterns as emissions_urlpatterns
+
+from urls_utils import decorated_includes
+
 
 sqs = SearchQuerySet().facet('categories').facet('tags')
 
@@ -19,7 +24,11 @@ urlpatterns = patterns('',
     (r'^ckeditor/', include('ckeditor.urls')),
     url(r'^search/', search_view_factory(view_class=FacetedSearchView,
         form_class=FacetedSearchForm, searchqueryset=sqs), name='haystack_search'),
-    url(r'^emissions/', include('panikdb.emissions.urls')),
+
+    url(r'^emissions/',
+        decorated_includes(login_required, include(emissions_urlpatterns))),
+
+    url(r'^accounts/', include('registration.backends.default.urls')),
 
     url(r'^admin/', include(admin.site.urls)),
 )

diff --git a/panikdb/urls_utils.py b/panikdb/urls_utils.py
new file mode 100644 (file)
index 0000000..ace2cce
--- /dev/null
+++ b/panikdb/urls_utils.py
@@ -0,0 +1,30 @@
+from django.core.urlresolvers import RegexURLPattern, RegexURLResolver
+
+class DecoratedURLPattern(RegexURLPattern):
+    def resolve(self, *args, **kwargs):
+        result = super(DecoratedURLPattern, self).resolve(*args, **kwargs)
+        if result:
+            result.func = self._decorate_with(result.func)
+        return result
+
+class DecoratedRegexURLResolver(RegexURLResolver):
+    def resolve(self, *args, **kwargs):
+        result = super(DecoratedRegexURLResolver, self).resolve(*args, **kwargs)
+        if result:
+            result.func = self._decorate_with(result.func)
+        return result
+
+def decorated_includes(func, includes, *args, **kwargs):
+    urlconf_module, app_name, namespace = includes
+
+    for item in urlconf_module:
+        if isinstance(item, RegexURLPattern):
+            item.__class__ = DecoratedURLPattern
+            item._decorate_with = func
+
+        elif isinstance(item, RegexURLResolver):
+            item.__class__ = DecoratedRegexURLResolver
+            item._decorate_with = func
+
+    return urlconf_module, app_name, namespace
+

diff --git a/requirements.txt b/requirements.txt
index 5c18bb5eb08da3ba575247063ac3c255d1b99da3..56b089f4677327e8c5ad88a83ef1b919292ae19d 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,3 +3,4 @@ south>=0.8,<0.9
 django-ckeditor
 django-taggit
 git+https://github.com/toastdriven/django-haystack.git
+django-registration