diff --git a/amadeus/settings.py b/amadeus/settings.py index f169c68..34afcfe 100644 --- a/amadeus/settings.py +++ b/amadeus/settings.py @@ -47,6 +47,7 @@ INSTALLED_APPS = [ 'app', 'courses', 'users', + 'forum', ] MIDDLEWARE_CLASSES = [ diff --git a/amadeus/urls.py b/amadeus/urls.py index ce80d26..434b791 100644 --- a/amadeus/urls.py +++ b/amadeus/urls.py @@ -23,6 +23,7 @@ urlpatterns = [ url(r'^home/', include('app.urls', namespace = 'app')), url(r'^course/', include('courses.urls', namespace = 'course')), url(r'^users/', include('users.urls', namespace = 'users')), + url(r'^forum/', include('forum.urls', namespace = 'forum')), url(r'^admin/', admin.site.urls), url(r'^', include('core.urls', namespace = 'core')), ] diff --git a/courses/templates/subject/form_view_teacher.html b/courses/templates/subject/form_view_teacher.html index 2054acf..9acd26c 100644 --- a/courses/templates/subject/form_view_teacher.html +++ b/courses/templates/subject/form_view_teacher.html @@ -1,19 +1,53 @@ -{% load i18n %} +{% load static i18n %} + +{% block javascript %} + +{% endblock %}
- -
-
-
-

{{topic}}

-
-
- {% trans "edit" %} -
+ +
+
+
+

{{topic}}

+
+
+ {% trans "edit" %} +
+
+
+ +
+

{{topic.description|linebreaks}}

+ Forum
-
- -
-

{{topic.description|linebreaks}}

-
+ + \ No newline at end of file diff --git a/courses/views.py b/courses/views.py index d3fa9b1..ea1025b 100644 --- a/courses/views.py +++ b/courses/views.py @@ -281,7 +281,7 @@ class TopicsView(LoginRequiredMixin, generic.ListView): def get_queryset(self): topic = get_object_or_404(Topic, slug = self.kwargs.get('slug')) subject = topic.subject - context = subject.topics.filter(visible=True) + context = Topic.objects.filter(subject = subject, visible=True) #if (self.request.user in subject.professors.all() or has_role(self.request.user,'system_admin')): #context = subject.topics.all() <- Change it By Activities return context diff --git a/forum/models.py b/forum/models.py index 5a6fd2b..acf2189 100644 --- a/forum/models.py +++ b/forum/models.py @@ -13,7 +13,6 @@ It works like a 'topic' of forum, which users can post to it and answer posts of class Forum(Activity): title = models.CharField(_('Title'), max_length = 100) description = models.TextField(_('Description'), blank = True) - create_date = models.DateTimeField(_('Create Date'), auto_now_add = True) class Meta: verbose_name = _('Forum') diff --git a/forum/templates/forum_list.html b/forum/templates/forum_list.html new file mode 100644 index 0000000..0556598 --- /dev/null +++ b/forum/templates/forum_list.html @@ -0,0 +1,41 @@ +
+

Forum

+ Descricao: Learning Python

+ Abertura: Sexta-feira, 10 Junho 2016 +

+ \ No newline at end of file diff --git a/forum/urls.py b/forum/urls.py new file mode 100644 index 0000000..a546bcb --- /dev/null +++ b/forum/urls.py @@ -0,0 +1,8 @@ +from django.conf.urls import url, include + +from . import views + + +urlpatterns = [ + url(r'^$', views.ForumIndex.as_view(), name='index'), +] diff --git a/forum/views.py b/forum/views.py index 91ea44a..aee77a5 100644 --- a/forum/views.py +++ b/forum/views.py @@ -1,3 +1,22 @@ -from django.shortcuts import render +from django.shortcuts import render, get_object_or_404 +from django.core.urlresolvers import reverse_lazy +from django.utils.translation import ugettext_lazy as _ +from django.views.generic import ListView +from django.contrib.auth.mixins import LoginRequiredMixin -# Create your views here. +from .models import Forum +from courses.models import Topic + +class ForumIndex(LoginRequiredMixin, ListView): + login_url = reverse_lazy("core:home") + redirect_field_name = 'next' + + template_name = "forum_list.html" + context_object_name = 'forum' + + def get_queryset(self): + topic = get_object_or_404(Topic, slug = self.request.GET.get('topic', '')) + + context = Forum.objects.filter(topic = topic) + + return context -- libgit2 0.21.2