merge from develop

djadmin2/core.py

@@ -121,11 +121,22 @@ class Admin2(object):
 
     def get_urls(self):
         urlpatterns = patterns('',
-<<<<<<< HEAD
             url(regex=r'^$',
                 view=self.index_view.as_view(**self.get_index_kwargs()),
                 name='dashboard'
             ),
+            url(regex='^password_change/$',
+                view=views.PasswordChangeView.as_view(),
+                name='password-change'
+                ),
+            url(regex='^password_change_done/$',
+                view=views.PasswordChangeDoneView.as_view(),
+                name='password-change-done'
+                ),
+            url(regex='^logout/$',
+                view=views.LogoutView.as_view(),
+                name='logout'
+                ),
             url(
                 regex=r'^(?P<app_label>\w+)/$',
                 view=self.app_index_view.as_view(**self.get_app_index_kwargs()),
@@ -136,31 +147,6 @@ class Admin2(object):
                 view=self.api_index_view.as_view(**self.get_api_index_kwargs()),
                 name='api-index'
             ),
-
-            url(regex=r'^password_change/$',
-                regex=rlogin_required(views.PasswordChangeView.as_view()),
-                name='password-change'
-                ),
-            url(regex=r'^password_change_done/$',
-                login_required(views.PasswordChangeDoneView.as_view()),
-                name='password-change-done'
-                ),
-            url(regex=r'^logout/$',
-                login_required(views.LogoutView.as_view()),
-                name='logout'
-                ),
-=======
-            url(r'^$', self.index_view.as_view(**self.get_index_kwargs()), name='dashboard'),
-            url(r'^api/v0/$',
-            self.api_index_view.as_view(**self.get_api_index_kwargs()), name='api-index'),
-
-            url('^password_change/$', views.PasswordChangeView.as_view(),
-                name='password-change'),
-            url('^password_change_done/$', views.PasswordChangeDoneView.as_view(),
-                name='password-change-done'),
-            url('^logout/$', views.LogoutView.as_view(),
-                name='logout'),
->>>>>>> use django-braces for login required views
         )
 
         for model, model_admin in self.registry.iteritems():

djadmin2/templates/admin2/bootstrap/auth/logout.html

@@ -3,6 +3,11 @@
 {% load i18n %}
 {% load admin2_tags %}
 
+{% block breadcrumbs %}
+    <li><a href="{% url "admin2:dashboard" %}">Home</a> <span class="divider">/</span></li>
+    <li class="active">{% trans "Logout" %}</li>
+{% endblock %}
+
 {% block content %}
 <div class="row">
     <div class="span12">

djadmin2/templates/admin2/bootstrap/auth/password_change_done.html

@@ -6,6 +6,11 @@
 {% block title %}{% trans 'Password change successful' %}{% endblock %}
 {% block page_title %}{% trans 'Password change successful' %}{% endblock %}
 
+{% block breadcrumbs %}
+    <li><a href="{% url "admin2:dashboard" %}">Home</a> <span class="divider">/</span></li>
+    <li class="active">{% trans "Password change successful" %}</li>
+{% endblock %}
+
 {% block content %}
 <div class="row">
     <div class="span12">

djadmin2/templates/admin2/bootstrap/auth/password_change_form.html

@@ -5,6 +5,11 @@
 
 {% block page_title %}{% trans "Password change" %}{% endblock %}
 
+{% block breadcrumbs %}
+    <li><a href="{% url "admin2:dashboard" %}">Home</a> <span class="divider">/</span></li>
+    <li class="active">{% trans "Password change" %}</li>
+{% endblock %}
+
 {% block content %}
 <div class="row">
     <div class="span12">

djadmin2/viewmixins.py

@@ -5,8 +5,7 @@ from django.core.exceptions import PermissionDenied
 from django.core.urlresolvers import reverse, reverse_lazy
 from django.forms.models import modelform_factory
 from django.http import HttpResponseRedirect
-from braces.views import (AccessMixin,
-                          LoginRequiredMixin as BracesLoginRequiredMixin)
+from braces.views import (AccessMixin)
 
 from . import constants, permissions
 from .utils import admin2_urlname, model_options
@@ -77,13 +76,13 @@ class Admin2Mixin(PermissionMixin):
             return self.form_class
         return modelform_factory(self.get_model())
 
-    def has_permission(self, request):
+    def is_user(self, request):
         return hasattr(request, 'user') and not (request.user.is_active and
                                                  request.user.is_staff)
 
     def dispatch(self, request, *args, **kwargs):
 
-        if self.has_permission(request):
+        if self.is_user(request):
             from .views import LoginView
 
             if request.path == reverse('admin2:logout'):
@@ -138,6 +137,6 @@ class Admin2ModelFormMixin(object):
         return reverse(admin2_urlname(self, 'index'))
 
 
-class LoginRequiredMixin(BracesLoginRequiredMixin):
+class LoginRequiredMixin(PermissionMixin):
 
     login_url = reverse_lazy('admin2:dashboard')