Webpages list visualization control

Zambom
1 parent 47688d90
Showing 3 changed files with 9 additions and 3 deletions Show diff stats
amadeus/permissions.py
amadeus/templatetags/permissions_tags.py
topics/templates/resources/list.html
@@ -39,7 +39,7 @@ def has_resource_permissions(user, resource):
 	if resource.visible or resource.topic.repository:
 		if resource.all_students:
-			if subject.students.filter(id = user.id).exists():
+			if resource.topic.subject.students.filter(id = user.id).exists():
 				return True
 		if resource.students.filter(id = user.id).exists():
@@ -10,4 +10,8 @@ def subject_permissions(user, subject):
 @register.assignment_tag
 def subject_view_permissions(user, subject):
-	return permissions.has_subject_view_permissions(user, subject)
 \ No newline at end of file
+	return permissions.has_subject_view_permissions(user, subject)
+
+@register.assignment_tag
+def resource_permissions(user, resource):
+	return permissions.has_resource_permissions(user, resource)
 \ No newline at end of file
@@ -5,7 +5,9 @@
 <div id="resource_{{ topic.slug }}" class="list-group resource_list">
 	{% for resource in topic.resource_topic.all %}
-		{% if resource.visible or has_subject_permissions %}
+		{% resource_permissions request.user resource as has_resource_permissions %}
+		
+		{% if has_resource_permissions %}
 	  		<div class="list-group-item {% if not resource.visible %}disabled{% endif %}">
 	  			<input type="hidden" class="id_inp" name="id" value="{{ resource.id }}" />
 		    	<input type="hidden" class="order_inp" name="order" value="{{ resource.order }}" />
	@@ -39,7 +39,7 @@ def has_resource_permissions(user, resource):		@@ -39,7 +39,7 @@ def has_resource_permissions(user, resource):
39		39
40	if resource.visible or resource.topic.repository:	40	if resource.visible or resource.topic.repository:
41	if resource.all_students:	41	if resource.all_students:
42	- if subject.students.filter(id = user.id).exists():	42	+ if resource.topic.subject.students.filter(id = user.id).exists():
43	return True	43	return True
44		44
45	if resource.students.filter(id = user.id).exists():	45	if resource.students.filter(id = user.id).exists():