diff --git a/subjects/templates/subjects/initial.html b/subjects/templates/subjects/initial.html index 07ce36e..9cb5f6c 100644 --- a/subjects/templates/subjects/initial.html +++ b/subjects/templates/subjects/initial.html @@ -16,7 +16,7 @@
-

{% trans "Meus Assuntos" %}

+

{% trans "Meus Assuntos" %}

{% for subject in subjects %} {% include "subjects/subject_card.html" with accordion_id="subject-accordion" %} diff --git a/subjects/templates/subjects/subject_card.html b/subjects/templates/subjects/subject_card.html index 8d9a1c4..e5cfb1e 100644 --- a/subjects/templates/subjects/subject_card.html +++ b/subjects/templates/subjects/subject_card.html @@ -57,7 +57,7 @@ {% endif %}
-{% elif request.user in subject.professor.all or request.user in category.coordinators.all %} +{% elif request.user in subject.professor.all or request.user in subject.category.coordinators.all %}
diff --git a/subjects/views.py b/subjects/views.py index 939e73a..478e01d 100644 --- a/subjects/views.py +++ b/subjects/views.py @@ -44,9 +44,7 @@ class HomeView(LoginRequiredMixin, ListView): 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() or self.request.user in subject.category.coordinators.all()] - - paginator = Paginator(subjects, 10) - + print(subjects) return subjects @@ -165,11 +163,9 @@ class SubjectCreateView(CreateView): return super(SubjectCreateView, self).form_valid(form) def get_success_url(self): - if not self.object.category.visible: self.object.visible = False self.object.save() - messages.success(self.request, _('Subject "%s" was registered on "%s" successfully!')%(self.object.name, self.object.category.name )) return reverse_lazy('subjects:index') @@ -191,17 +187,13 @@ class SubjectUpdateView(LogMixin, UpdateView): return context def get_success_url(self): - if not self.object.category.visible: self.object.visible = False self.object.save() - messages.success(self.request, _('Subject "%s" was updated on "%s" successfully!')%(self.object.name, self.object.category.name )) return reverse_lazy('subjects:index') - - class SubjectDeleteView(LoginRequiredMixin, LogMixin, DeleteView): login_url = reverse_lazy("users:login") @@ -227,7 +219,6 @@ class SubjectDeleteView(LoginRequiredMixin, LogMixin, DeleteView): def get_success_url(self): messages.success(self.request, _('Subject removed successfully!')) - return reverse_lazy('subjects:index') -- libgit2 0.21.2