From 858671e684ede1ce04e749adb9f91454281bcee9 Mon Sep 17 00:00:00 2001 From: fbormann Date: Sat, 22 Oct 2016 00:22:09 -0300 Subject: [PATCH] fixed teacher create subject button on courses:view --- app/views.py | 2 +- courses/templates/course/view.html | 2 +- forum/views.py | 8 ++++++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/views.py b/app/views.py index 87c1d2d..742e3d8 100644 --- a/app/views.py +++ b/app/views.py @@ -40,7 +40,7 @@ class AppIndex(LoginRequiredMixin, LogMixin, ListView, NotificationMixin): else: self.template_name = "home_teacher_student_content.html" - super(AppIndex, self).createNotification("testando notificacao de login", resource_name="home", resource_link="/") + super(AppIndex, self).createNotification("you have just logged in", resource_name="home", resource_link="/") return self.response_class(request = self.request, template = self.template_name, context = context, using = self.template_engine, **response_kwargs) diff --git a/courses/templates/course/view.html b/courses/templates/course/view.html index 9311e66..eb665c1 100644 --- a/courses/templates/course/view.html +++ b/courses/templates/course/view.html @@ -301,7 +301,7 @@ {% endfor %} {% endif %} -{% if user|has_role:'professor' and user in course.professors or user|has_role:'system_admin' %} +{% if user|has_role:'professor' and user in course.professors.all or user|has_role:'system_admin' %}
{% trans 'Create Subject' %}
diff --git a/forum/views.py b/forum/views.py index 409799a..c857b74 100644 --- a/forum/views.py +++ b/forum/views.py @@ -9,6 +9,7 @@ from django.http import Http404 from .models import Forum, Post, PostAnswer from courses.models import Topic +from core.mixins import NotificationMixin from .forms import ForumForm, PostForm, PostAnswerForm @@ -36,7 +37,7 @@ class ForumIndex(LoginRequiredMixin, generic.ListView): return context -class CreateForumView(LoginRequiredMixin, generic.edit.CreateView): +class CreateForumView(LoginRequiredMixin, generic.edit.CreateView, NotificationMixin): login_url = reverse_lazy("core:home") redirect_field_name = 'next' @@ -51,7 +52,10 @@ class CreateForumView(LoginRequiredMixin, generic.edit.CreateView): def get_success_url(self): self.success_url = reverse('course:forum:render_forum', args = (self.object.id, )) - + print(self.object) + print(self) + #super(CreateForumView, self).createNotification(message="The Forum",action_name="create forum", ) + return self.success_url def render_forum(request, forum): -- libgit2 0.21.2