From f3dd74d367ab3e2f1d7ea30fefb170b94112eb72 Mon Sep 17 00:00:00 2001
From: artus <artus40@users.noreply.github.com>
Date: Sat, 6 Aug 2016 10:42:19 +0200
Subject: [PATCH] fixed WebsiteProtectedWithAjaxMixin template response

---
 maraudes/views.py |  5 +++--
 sujets/views.py   |  3 ++-
 website/views.py  | 34 ++++++++++++++++++++--------------
 3 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/maraudes/views.py b/maraudes/views.py
index 4f65a72..e13a2f1 100644
--- a/maraudes/views.py
+++ b/maraudes/views.py
@@ -294,13 +294,14 @@ class PlanningView(MaraudesView, generic.TemplateView):
 
 ## LIEU
 
-class LieuCreateView(MaraudesView, views.AjaxTemplateMixin, generic.edit.CreateView):
+class LieuCreateView(views.WebsiteProtectedWithAjaxMixin, generic.edit.CreateView):
     model = Lieu
-    ajax_template_name = "maraudes/lieu_create_inner.html"
     template_name = "maraudes/lieu_create.html"
     fields = "__all__"
     success_url = "/maraudes/"
 
+    permissions = ['maraudes.add_lieu']
+
     def post(self, request, *args, **kwargs):
         if 'next' in self.request.POST:
             self.success_url = self.request.POST["next"]
diff --git a/sujets/views.py b/sujets/views.py
index 5f62009..559e685 100644
--- a/sujets/views.py
+++ b/sujets/views.py
@@ -43,13 +43,14 @@ class SujetCreateForm(ModelForm):
 
 
 
-class SujetCreateView(SujetsView, generic.edit.CreateView, views.AjaxTemplateMixin):
+class SujetCreateView(views.WebsiteProtectedWithAjaxMixin, generic.edit.CreateView):
     template_name = "sujets/sujet_create.html"
     form_class = SujetCreateForm
 
     title = "Création : Sujet"
     header = "Ajouter un sujet"
 
+    permissions = ['sujets.view_sujets', 'sujets.add_sujet']
 
     def post(self, request, *args, **kwargs):
         if 'next' in self.request.POST:
diff --git a/website/views.py b/website/views.py
index dab817d..d062312 100644
--- a/website/views.py
+++ b/website/views.py
@@ -24,18 +24,6 @@ class PermissionRequiredMixin(object):
         return permission_required(cls.permissions)(view)
 
 
-class AjaxTemplateMixin(object):
-    """ Mixin that enables the use of 'ajax_template_name' custom template
-        when request is Ajax.
-    """
-    def dispatch(self, request, *args, **kwargs):
-        if not hasattr(self, 'ajax_template_name'):
-            raise NotImplementedError
-        if request.is_ajax():
-            self.template_name = self.ajax_template_name
-        return super(AjaxTemplateMixin, self).dispatch(request, *args, **kwargs)
-
-
 
 class TemplateFieldsMetaclass(type):
     """ Loads Template objects with given string for
@@ -129,8 +117,26 @@ class WebsiteTemplateMixin(TemplateResponseMixin):
 class WebsiteProtectedMixin(WebsiteTemplateMixin, PermissionRequiredMixin):
     pass
 
-class WebsiteProtectedWithAjaxMixin(WebsiteProtectedMixin, AjaxTemplateMixin):
-    pass
+class WebsiteProtectedWithAjaxMixin(WebsiteProtectedMixin):
+    """ Mixin that enables the use of 'ajax_template_name' custom template
+        when request is Ajax.
+    """
+    is_ajax = False
+
+    def dispatch(self, request, *args, **kwargs):
+        if not hasattr(self, 'ajax_template_name'):
+            self.ajax_template_name = "%s_inner.html" % self.template_name.split(".")[0]
+            print('%s :' % self, self.ajax_template_name)
+        if request.is_ajax():
+            self.is_ajax = True
+            self.template_name = self.ajax_template_name
+        return super().dispatch(request, *args, **kwargs)
+
+    def get_template_names(self):
+        if self.is_ajax:
+            return [self.template_name]
+        else:
+            return super().get_template_names()
 
 ## Views : Index ##