Merge branch 'refactoring' of https://github.com/amadeusproject/amadeuslms into refactoring

Felipe Henrique de Almeida Bormann
2 parents 9b2182dd cfbf635f
Showing 2 changed files with 14 additions and 3 deletions Show diff stats
amadeus/templatetags/permissions_tags.py
subjects/templates/subjects/view.html
@@ -0,0 +1,9 @@
+from django import template
+
+from amadeus import permissions
+
+register = template.Library()
+
+@register.assignment_tag
+def subject_permissions(user, subject):
+	return permissions.has_subject_permissions(user, subject)
 \ No newline at end of file
 {% extends 'categories/home.html' %}
  
-{% load static i18n pagination %}
+{% load static i18n pagination permissions_tags %}
 {% load django_bootstrap_breadcrumbs %}
  
 {% block javascript%}
@@ -25,10 +25,12 @@
         {% endfor %}
     {% endif %}
  
+    {% subject_permissions request.user subject as has_subject_permissions %}
+
 	{% if subject.visible %}
 		<div class="panel panel-info subject-panel">
         	<div class="panel-heading">
-	{% elif request.user in subject.professor.all or request.user in subject.category.coordinators.all or request.user.is_staff %}
+	{% elif has_subject_permissions %}
 		<div class="panel panel-info subject-panel-invisible">
         	<div class="panel-heading panel-invisible">
     {% endif %}
@@ -78,7 +80,7 @@
  
             <p>{{subject.description|safe}}</p>
  
-            {% if request.user in subject.professor.all or request.user in subject.category.coordinators.all or request.user.is_staff %}
+            {% if has_subject_permissions %}
                 <a href="{% url 'topics:create' subject.slug %}" class="btn btn-sm btn-success btn-raised btn-block">{% trans "Create new topic" %}</a>
             {% endif %}
...	...	@@ -0,0 +1,9 @@
	1	+from django import template
	2	+
	3	+from amadeus import permissions
	4	+
	5	+register = template.Library()
	6	+
	7	+@register.assignment_tag
	8	+def subject_permissions(user, subject):
	9	+ return permissions.has_subject_permissions(user, subject)
0	10	\ No newline at end of file
...	...
1	1	{% extends 'categories/home.html' %}
2	2
3		-{% load static i18n pagination %}
	3	+{% load static i18n pagination permissions_tags %}
4	4	{% load django_bootstrap_breadcrumbs %}
5	5
6	6	{% block javascript%}
...	...	@@ -25,10 +25,12 @@
25	25	{% endfor %}
26	26	{% endif %}
27	27
	28	+ {% subject_permissions request.user subject as has_subject_permissions %}
	29	+
28	30	{% if subject.visible %}
29	31	<div class="panel panel-info subject-panel">
30	32	<div class="panel-heading">
31		- {% elif request.user in subject.professor.all or request.user in subject.category.coordinators.all or request.user.is_staff %}
	33	+ {% elif has_subject_permissions %}
32	34	<div class="panel panel-info subject-panel-invisible">
33	35	<div class="panel-heading panel-invisible">
34	36	{% endif %}
...	...	@@ -78,7 +80,7 @@
78	80
79	81	<p>{{subject.description\|safe}}</p>
80	82
81		- {% if request.user in subject.professor.all or request.user in subject.category.coordinators.all or request.user.is_staff %}
	83	+ {% if has_subject_permissions %}
82	84	<a href="{% url 'topics:create' subject.slug %}" class="btn btn-sm btn-success btn-raised btn-block">{% trans "Create new topic" %}</a>
83	85	{% endif %}
84	86
...	...