From dfca5315ef7b2c71f80d6859da83d7d6144d02f0 Mon Sep 17 00:00:00 2001
From: felipebormann <felipe.bormann@gmail.com>
Date: Fri, 17 Feb 2017 02:23:36 -0300
Subject: [PATCH] modified subject delete process, now it works on /view and on /home with redirect

---
 categories/views.py                           |  3 +--
 subjects/static/subjects/js/modal_subject.js  |  1 +
 subjects/templates/subjects/initial.html      |  2 +-
 subjects/templates/subjects/list.html         |  1 +
 subjects/templates/subjects/subject_card.html |  4 ++--
 subjects/views.py                             | 31 +++++++++++++++++++++++++++++--
 6 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/categories/views.py b/categories/views.py
index affe589..44a3b17 100644
--- a/categories/views.py
+++ b/categories/views.py
@@ -50,8 +50,7 @@ class IndexView(views.SuperuserRequiredMixin, LoginRequiredMixin, ListView):
         if self.request.is_ajax():
             if self.request.user.is_staff:
                 self.template_name = "categories/home_admin_content.html"
-            else:
-                self.template_name = "categories/home_teacher_student_content.html"
+           
 
         return self.response_class(request = self.request, template = self.template_name, context = context, using = self.template_engine, **response_kwargs)
 
diff --git a/subjects/static/subjects/js/modal_subject.js b/subjects/static/subjects/js/modal_subject.js
index 18d2ea7..126588c 100644
--- a/subjects/static/subjects/js/modal_subject.js
+++ b/subjects/static/subjects/js/modal_subject.js
@@ -6,6 +6,7 @@ var RemoveSubject = {
         $('body').removeClass('modal-open');
         $("#modal_course").empty();
         $(".modal-backdrop.in").remove();
+        window.location.href = data['url'];
         alertify.success("Subject removed successfully!");
       }).fail(function(){
         $("#modal_course").empty();
diff --git a/subjects/templates/subjects/initial.html b/subjects/templates/subjects/initial.html
index ab13a0a..76eb046 100644
--- a/subjects/templates/subjects/initial.html
+++ b/subjects/templates/subjects/initial.html
@@ -59,6 +59,6 @@
 	</div>
 
 	<div id="modal_subject"></div>
-
+	<script type="text/javascript" src="{% static "subjects/js/modal_subject.js" %}"></script>
     <script type="text/javascript" src="{% static 'js/category.js' %}"></script>
 {% endblock content %}
\ No newline at end of file
diff --git a/subjects/templates/subjects/list.html b/subjects/templates/subjects/list.html
index f99990c..1d72c6d 100644
--- a/subjects/templates/subjects/list.html
+++ b/subjects/templates/subjects/list.html
@@ -187,6 +187,7 @@
     <div id="modal_subject"></div>
     
     <script type="text/javascript" src="{% static 'js/category.js' %}"></script>
+    <script type="text/javascript" src="{% static "subjects/js/modal_subject.js" %}"></script>
     <script type="text/javascript">
         $(function (){
             var cat_slug = "{{ cat_slug }}"
diff --git a/subjects/templates/subjects/subject_card.html b/subjects/templates/subjects/subject_card.html
index 1093f50..3c0276a 100644
--- a/subjects/templates/subjects/subject_card.html
+++ b/subjects/templates/subjects/subject_card.html
@@ -5,10 +5,10 @@
 
 {% if subject.visible or has_subject_permissions %}
     {% if subject.visible %}
-        <div class="panel panel-info subject-panel">
+        <div class="panel panel-info subject-panel" id="subject_{{subject.slug}}">
             <div class="panel-heading">
     {% elif has_subject_permissions %}
-        <div class="panel panel-info subject-panel-invisible">
+        <div class="panel panel-info subject-panel-invisible" id="subject_{{subject.slug}}">
             <div class="panel-heading panel-invisible">
     {% endif %}
             <div class="row">
diff --git a/subjects/views.py b/subjects/views.py
index df19725..afa0280 100644
--- a/subjects/views.py
+++ b/subjects/views.py
@@ -172,8 +172,7 @@ class IndexView(LoginRequiredMixin, ListView):
         if self.request.is_ajax():
             if self.request.user.is_staff:
                 self.template_name = "categories/home_admin_content.html"
-            else:
-                self.template_name = "categories/home_teacher_student_content.html"
+         
 
         return self.response_class(request = self.request, template = self.template_name, context = context, using = self.template_engine, **response_kwargs)
 
@@ -399,6 +398,30 @@ class SubjectDeleteView(LoginRequiredMixin, LogMixin, DeleteView):
 
         return super(SubjectDeleteView, self).dispatch(request, *args, **kwargs)
 
+
+    def delete(self, request, *args, **kwargs):
+        self.object = self.get_object()
+        self.object.delete()
+        if not (self.request.GET.get('view') == 'index'):
+            return self.ajax_success()
+        return HttpResponseRedirect(self.get_success_url())
+
+    def ajax_success(self):
+        self.log_context['category_id'] = self.object.category.id
+        self.log_context['category_name'] = self.object.category.name
+        self.log_context['category_slug'] = self.object.category.slug
+        self.log_context['subject_id'] = self.object.id
+        self.log_context['subject_name'] = self.object.name
+        self.log_context['subject_slug'] = self.object.slug
+        print("here 2")
+        super(SubjectDeleteView, self).createLog(self.request.user, self.log_component, self.log_action, self.log_resource, self.log_context)
+
+        
+        messages.success(self.request, _('Subject "%s" removed successfully!')%(self.object.name))
+        
+        return JsonResponse({'url':reverse_lazy('subjects:index')})
+
+
     def get(self, request, *args, **kwargs):
         self.object = self.get_object()
         if self.object.students.count() > 0:
@@ -411,6 +434,10 @@ class SubjectDeleteView(LoginRequiredMixin, LogMixin, DeleteView):
         context = self.get_context_data(object=self.object)
         return self.render_to_response(context)
 
+    def post(self, *args, **kwargs):
+        print("here")
+        return self.delete(*args, **kwargs)
+
     def get_context_data(self, **kwargs):
         context = super(SubjectDeleteView, self).get_context_data(**kwargs)
         subject = get_object_or_404(Subject, slug = self.kwargs.get('slug'))
--
libgit2 0.21.2