Download as
Browse Code »

Commit 57339a6ddbc149fd5c980014c020a76df7e0d4eb

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

fixed coordinators in categories

Showing 3 changed files with 5 additions and 6 deletions   Show diff stats
subjects/forms.py
  Diff comments   View file @57339a6
... ... @@ -66,9 +66,10 @@ class CreateSubjectForm(forms.ModelForm):
66 66 return cleaned_data
67 67 def clean_subscribe_begin(self):
68 68 subscribe_begin = self.cleaned_data['subscribe_begin']
69   - #if subscribe_begin < datetime.datetime.today().date():
70   - #self._errors['subscribe_begin'] = _('this date must be today or after')
71   - #raise forms.ValidationError(_(''))
  69 + if subscribe_begin < datetime.datetime.today().date():
  70 + print("aqui")
  71 + self._errors['subscribe_begin'] = _('this date must be today or after')
  72 + return ValueError
72 73 return subscribe_begin
73 74  
74 75 class CreateTagForm(forms.ModelForm):
... ...
subjects/templates/subjects/list.html
  Diff comments   View file @57339a6
... ... @@ -99,7 +99,7 @@
99 99  
100 100 <div class="panel-group subject-group" id="{{ category.slug }}-accordion" role="tablist" aria-multiselectable="true">
101 101 {% for subject in category.subject_category.all %}
102   - {% if request.user in subject.students.all or request.user.is_staff or request.user in subject.professor.all or all %}
  102 + {% if request.user in subject.students.all or request.user.is_staff or request.user in subject.professor.all or all or request.user in subject.category.coordinators.all %}
103 103  
104 104 {% include "subjects/subject_card.html" %}
105 105 {% endif %}
... ...
subjects/views.py
  Diff comments   View file @57339a6
... ... @@ -32,7 +32,6 @@ from users.models import User
32 32 class HomeView(LoginRequiredMixin, ListView):
33 33 login_url = reverse_lazy("users:login")
34 34 redirect_field_name = 'next'
35   - queryset = Subject.objects.all().order_by('name')
36 35 template_name = 'subjects/initial.html'
37 36 context_object_name = 'subjects'
38 37 paginate_by = 10
... ... @@ -63,7 +62,6 @@ class IndexView(LoginRequiredMixin, ListView):
63 62  
64 63 login_url = reverse_lazy("users:login")
65 64 redirect_field_name = 'next'
66   - queryset = Category.objects.all().order_by('name')
67 65 template_name = 'subjects/list.html'
68 66 context_object_name = 'categories'
69 67 paginate_by = 10
... ...