added subject to apps, modified delete message and checked for condition on categories index

Felipe Henrique de Almeida Bormann
1 parent 32fa886a
Showing 4 changed files with 12 additions and 3 deletions Show diff stats
amadeus/settings.py
categories/templates/categories/delete.html
categories/templates/categories/list.html
categories/views.py
@@ -55,7 +55,8 @@ INSTALLED_APPS = [
     'users',
     'notifications',
     'log',
-    'categories'
+    'categories',
+    'subjects'
 ]
 MIDDLEWARE_CLASSES = [
@@ -14,7 +14,7 @@
         <!-- Put ONLY your content here!!!  -->
         <form id="delete_form" action="{% url 'categories:delete' category.slug %}" method="post">
           {% csrf_token %}
-          <p>{% trans 'Are you sure you want to delete the category' %} "{{category.name}}"?</p>
+          <p>{% trans 'Are you sure you want to delete the category' %} "{{category.name}}"? {% trans "All its data will be lost and can't be recovered" %}</p>
         </form>
       </div>
       <!-- Modal Footer -->
@@ -23,7 +23,9 @@
 {% endfor %}
 {% endif %}
-<a href="{% url 'categories:create' %}"><button id="create-category"> {% trans "Create Category" %}</button></a>
+{% if user.is_staff %}
+  <a href="{% url 'categories:create' %}"><button id="create-category"> {% trans "Create Category" %}</button></a>
+{% endif %}
 <!-- Code for listing categories -->
 <div class="col-md-12 cards-content">
@@ -83,6 +83,12 @@ class DeleteCategory(HasRoleMixin, DeleteView):
     model = Category
     template_name = 'categories/delete.html'
+    def dispatch(self, *args, **kwargs):
+        category = get_object_or_404(Category, slug = self.kwargs.get('slug'))
+        if len(category.subject_set) > 0:
+            return self.handle_no_permission()
+
+        return super(DeleteCategory, self).dispatch(*args, **kwargs)
     def get_success_url(self):
	@@ -14,7 +14,7 @@		@@ -14,7 +14,7 @@
14	<!-- Put ONLY your content here!!! -->	14	<!-- Put ONLY your content here!!! -->
15	<form id="delete_form" action="{% url 'categories:delete' category.slug %}" method="post">	15	<form id="delete_form" action="{% url 'categories:delete' category.slug %}" method="post">
16	{% csrf_token %}	16	{% csrf_token %}
17	- <p>{% trans 'Are you sure you want to delete the category' %} "{{category.name}}"?</p>	17	+ <p>{% trans 'Are you sure you want to delete the category' %} "{{category.name}}"? {% trans "All its data will be lost and can't be recovered" %}</p>
18	</form>	18	</form>
19	</div>	19	</div>
20	<!-- Modal Footer -->	20	<!-- Modal Footer -->
	@@ -83,6 +83,12 @@ class DeleteCategory(HasRoleMixin, DeleteView):		@@ -83,6 +83,12 @@ class DeleteCategory(HasRoleMixin, DeleteView):
83	model = Category	83	model = Category
84	template_name = 'categories/delete.html'	84	template_name = 'categories/delete.html'
85		85
		86	+ def dispatch(self, args, *kwargs):
		87	+ category = get_object_or_404(Category, slug = self.kwargs.get('slug'))
		88	+ if len(category.subject_set) > 0:
		89	+ return self.handle_no_permission()
		90	+
		91	+ return super(DeleteCategory, self).dispatch(args, *kwargs)
86		92
87	def get_success_url(self):	93	def get_success_url(self):
88		94