diff --git a/subjects/forms.py b/subjects/forms.py index 8006553..8a11cd6 100644 --- a/subjects/forms.py +++ b/subjects/forms.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): diff --git a/subjects/templates/subjects/list.html b/subjects/templates/subjects/list.html index 5c2e20c..6f92f59 100644 --- a/subjects/templates/subjects/list.html +++ b/subjects/templates/subjects/list.html @@ -99,7 +99,7 @@
{% 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 %} diff --git a/subjects/views.py b/subjects/views.py index b8a054f..c5f3e2a 100644 --- a/subjects/views.py +++ b/subjects/views.py @@ -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 -- libgit2 0.21.2