Download as
Browse Code »

Commit 1fcb70551fdd21716097d1860a4f280d2d795708

Authored by Felipe Henrique de Almeida Bormann
1 parent d3705610
Exists in master and in 3 other branches amadeus_univasf, image-crop, refactoring

if the user is the coordinator of a category, it has access to it's subjects

Showing 3 changed files with 4 additions and 4 deletions   Show diff stats
categories/templates/categories/list.html
  Diff comments   View file @1fcb705
... ... @@ -96,7 +96,7 @@
96 96 </div>
97 97 </div>
98 98 {% elif request.user in category.coordinators.all or request.user.is_staff %}
99   - <div class="panelspecial-panel">
  99 + <div class="panel special-panel">
100 100 <div class="panel-heading panel-invisible ">
101 101 <div class="row">
102 102 <div class="col-md-12 category-header">
... ...
subjects/admin.py
  Diff comments   View file @1fcb705
... ... @@ -4,9 +4,9 @@ from .models import Subject, Marker
4 4 from .forms import CreateSubjectForm, CreateMarkerForm
5 5  
6 6 class SubjectAdmin(admin.ModelAdmin):
7   - list_display = ['name', 'description_brief', 'description', 'init_date', 'end_date', 'visible',]
  7 + list_display = ['name', 'description_brief', 'description', 'init_date', 'end_date', 'visible', 'category']
8 8 search_fields = ['name']
9   - form = CreateSubjectForm
  9 +
10 10  
11 11  
12 12 class MarkerAdmin(admin.ModelAdmin):
... ...
subjects/views.py
  Diff comments   View file @1fcb705
... ... @@ -41,7 +41,7 @@ class HomeView(LoginRequiredMixin, ListView):
41 41 subjects = Subject.objects.all()
42 42 else:
43 43 subjects = Subject.objects.all()
44   - subjects = [subject for subject in subjects if self.request.user in subject.students.all() or self.request.user in subject.professor.all()]
  44 + 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()]
45 45  
46 46  
47 47 paginator = Paginator(subjects, 10)
... ...