Adjusting category deletion

Zambom
1 parent 5d731a29
Showing 5 changed files with 22 additions and 10 deletions Show diff stats
amadeus/static/css/base/amadeus.css
categories/templates/categories/list.html
categories/views.py
subjects/templates/subjects/list.html
users/views.py
@@ -115,7 +115,7 @@
 .category-header .dropdown-menu i {
     font-size: 20px !important;
-    float: auto;
+    float: none;
 }
 .category-header i{
@@ -16,7 +16,11 @@
     {% if messages %}
         {% for message in messages %}
             <script type="text/javascript">
-                alertify.success('{{message}}');
+                {% if message.tags == "danger" %}
+                    alertify.error('{{message}}');
+                {% else %}
+                    alertify.success('{{message}}');
+                {% endif %}
             </script>
         {% endfor %}
     {% endif %}
-from django.shortcuts import render, get_object_or_404
+from django.shortcuts import render, get_object_or_404, redirect
 from django.views.generic import ListView, CreateView, DeleteView, UpdateView
 from .models import Category
 from django.core.urlresolvers import reverse_lazy
@@ -139,17 +139,20 @@ class DeleteCategory(LogMixin, DeleteView):
     login_url = reverse_lazy("users:login")
     redirect_field_name = 'next'
+
     model = Category
     template_name = 'categories/delete.html'
     def delete(self, request, *args, **kwargs):
         category = get_object_or_404(Category, slug = self.kwargs.get('slug'))
         subjects = Subject.objects.filter(category = category)
+
+        print(self.request.META.get('HTTP_REFERER'))
         if subjects.count() > 0:
-            #objeto = category
-            #messages.success(self.request, _('cannot delete Category "%s" ')%(objeto))
-            return reverse_lazy('categories:index')
+            messages.error(self.request, _('The category cannot be removed, it contains one or more virtual enviroments attach.'))
+
+            return redirect(self.request.META.get('HTTP_REFERER'))
         return super(DeleteCategory, self).delete(self, request, *args, **kwargs)
@@ -161,8 +164,8 @@ class DeleteCategory(LogMixin, DeleteView):
         super(DeleteCategory, self).createLog(self.request.user, self.log_component, self.log_action, self.log_resource, self.log_context)
         messages.success(self.request, _('Category removed successfully!'))
-        return reverse_lazy('categories:index')
+        return self.request.META.get('HTTP_REFERER')
 class UpdateCategory(LogMixin, UpdateView):
     log_component = 'category'
@@ -20,10 +20,15 @@
     {% if messages %}
         {% for message in messages %}
             <script type="text/javascript">
-                alertify.success('{{message}}');
+                {% if message.tags == "danger" %}
+                    alertify.error('{{message}}');
+                {% else %}
+                    alertify.success('{{message}}');
+                {% endif %}
             </script>
         {% endfor %}
-    {% endif %}    
+    {% endif %}
+
     <div id="core-subjects-options-div">
         <ul class="core-subjects-options">
             {% if all %}
-from django.shortcuts import get_object_or_404,redirect, render
+from django.shortcuts import get_object_or_404, redirect, render
 from django.views import generic
 from django.contrib import messages
 from django.contrib.auth import authenticate, login as login_user
	@@ -115,7 +115,7 @@		@@ -115,7 +115,7 @@
115		115
116	.category-header .dropdown-menu i {	116	.category-header .dropdown-menu i {
117	font-size: 20px !important;	117	font-size: 20px !important;
118	- float: auto;	118	+ float: none;
119	}	119	}
120		120
121	.category-header i{	121	.category-header i{
1	-from django.shortcuts import get_object_or_404,redirect, render	1	+from django.shortcuts import get_object_or_404, redirect, render
2	from django.views import generic	2	from django.views import generic
3	from django.contrib import messages	3	from django.contrib import messages
4	from django.contrib.auth import authenticate, login as login_user	4	from django.contrib.auth import authenticate, login as login_user