From 1fcb70551fdd21716097d1860a4f280d2d795708 Mon Sep 17 00:00:00 2001 From: Felipe Henrique de Almeida Bormann Date: Thu, 5 Jan 2017 18:23:52 -0300 Subject: [PATCH] if the user is the coordinator of a category, it has access to it's subjects --- categories/templates/categories/list.html | 2 +- subjects/admin.py | 4 ++-- subjects/views.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/categories/templates/categories/list.html b/categories/templates/categories/list.html index bc00301..6d72a53 100755 --- a/categories/templates/categories/list.html +++ b/categories/templates/categories/list.html @@ -96,7 +96,7 @@ {% elif request.user in category.coordinators.all or request.user.is_staff %} -
+
diff --git a/subjects/admin.py b/subjects/admin.py index 9b545d4..d22509a 100644 --- a/subjects/admin.py +++ b/subjects/admin.py @@ -4,9 +4,9 @@ from .models import Subject, Marker from .forms import CreateSubjectForm, CreateMarkerForm class SubjectAdmin(admin.ModelAdmin): - list_display = ['name', 'description_brief', 'description', 'init_date', 'end_date', 'visible',] + list_display = ['name', 'description_brief', 'description', 'init_date', 'end_date', 'visible', 'category'] search_fields = ['name'] - form = CreateSubjectForm + class MarkerAdmin(admin.ModelAdmin): diff --git a/subjects/views.py b/subjects/views.py index c1919e4..061ecd0 100644 --- a/subjects/views.py +++ b/subjects/views.py @@ -41,7 +41,7 @@ class HomeView(LoginRequiredMixin, ListView): subjects = Subject.objects.all() else: subjects = Subject.objects.all() - subjects = [subject for subject in subjects if self.request.user in subject.students.all() or self.request.user in subject.professor.all()] + subjects = [subject for subject in subjects if self.request.user in subject.students.all() or self.request.user in subject.professor.all() or self.request.user in subject.category.coordinators.all()] paginator = Paginator(subjects, 10) -- libgit2 0.21.2