fixed coordinators in categories

Felipe Henrique de Almeida Bormann
1 parent 03db6478
Showing 3 changed files with 5 additions and 6 deletions Show diff stats
subjects/forms.py
subjects/templates/subjects/list.html
subjects/views.py
@@ -66,9 +66,10 @@ class CreateSubjectForm(forms.ModelForm):
         return cleaned_data
     def clean_subscribe_begin(self):
         subscribe_begin = self.cleaned_data['subscribe_begin']
-        #if subscribe_begin < datetime.datetime.today().date():
-            #self._errors['subscribe_begin'] = _('this date must be today or after')
-            #raise forms.ValidationError(_(''))
+        if subscribe_begin < datetime.datetime.today().date():
+            print("aqui")
+            self._errors['subscribe_begin'] = _('this date must be today or after')
+            return ValueError
         return subscribe_begin
 class CreateTagForm(forms.ModelForm):
@@ -99,7 +99,7 @@
                             <div class="panel-group subject-group" id="{{ category.slug }}-accordion" role="tablist" aria-multiselectable="true">
                                 {% for subject in category.subject_category.all %}
-                                    {% if request.user in subject.students.all or request.user.is_staff or request.user in subject.professor.all or all %}
+                                    {% 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 %}
                                         {% include "subjects/subject_card.html" %}
                                     {% endif %}
@@ -32,7 +32,6 @@ from users.models import User
 class HomeView(LoginRequiredMixin, ListView):
     login_url = reverse_lazy("users:login")
     redirect_field_name = 'next'
-    queryset = Subject.objects.all().order_by('name')
     template_name = 'subjects/initial.html'
     context_object_name = 'subjects'
     paginate_by = 10    
@@ -63,7 +62,6 @@ class IndexView(LoginRequiredMixin, ListView):
     login_url = reverse_lazy("users:login")
     redirect_field_name = 'next'
-    queryset = Category.objects.all().order_by('name')
     template_name = 'subjects/list.html'
     context_object_name = 'categories'
     paginate_by = 10
	@@ -99,7 +99,7 @@		@@ -99,7 +99,7 @@
99		99
100	<div class="panel-group subject-group" id="{{ category.slug }}-accordion" role="tablist" aria-multiselectable="true">	100	<div class="panel-group subject-group" id="{{ category.slug }}-accordion" role="tablist" aria-multiselectable="true">
101	{% for subject in category.subject_category.all %}	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	{% include "subjects/subject_card.html" %}	104	{% include "subjects/subject_card.html" %}
105	{% endif %}	105	{% endif %}