diff --git a/subjects/templates/subjects/subject_card.html b/subjects/templates/subjects/subject_card.html index 13df9f8..a03b02b 100644 --- a/subjects/templates/subjects/subject_card.html +++ b/subjects/templates/subjects/subject_card.html @@ -49,11 +49,14 @@

{{subject.description_brief|safe}}

- - {% if request.user in subject.students.all or request.user in subject.professor.all or request.user.is_staff or request.user in category.coordinators.all %} - {% trans "Access Subject" %} - {% else %} - {% trans "Subscribe to Subject" %} + {% if show_buttons %} + + {% if request.user in subject.students.all or request.user in subject.professor.all or request.user.is_staff or request.user in category.coordinators.all %} + {% trans "Access Subject" %} + {% else %} + {% trans "Subscribe to Subject" %} + {% endif %} + {% endif %} @@ -107,11 +110,14 @@

{{subject.description_brief|safe}}

- - {% if request.user in subject.students.all or request.user in subject.professor.all or request.user.is_staff or request.user in category.coordinators.all %} - {% trans "Access Subject" %} - {% else %} - {% trans "Subscribe to Subject" %} + {% if show_buttons %} + + {% if request.user in subject.students.all or request.user in subject.professor.all or request.user.is_staff or request.user in category.coordinators.all %} + {% trans "Access Subject" %} + {% else %} + {% trans "Subscribe to Subject" %} + {% endif %} + {% endif %} diff --git a/subjects/templates/subjects/view.html b/subjects/templates/subjects/view.html new file mode 100644 index 0000000..4e402ae --- /dev/null +++ b/subjects/templates/subjects/view.html @@ -0,0 +1,23 @@ +{% extends 'categories/home.html' %} + +{% load static i18n pagination %} +{% load django_bootstrap_breadcrumbs %} + +{% block javascript%} + {{ block.super }} + +{% endblock%} + +{% block breadcrumbs %} + {{ block.super }} + +{% endblock %} + + +{% block content %} + + {% include "subjects/subject_card.html" %} + + + +{% endblock content %} \ No newline at end of file diff --git a/subjects/urls.py b/subjects/urls.py index a7758eb..2abe7bb 100644 --- a/subjects/urls.py +++ b/subjects/urls.py @@ -9,5 +9,6 @@ urlpatterns = [ url(r'^replicate/(?P[\w_-]+)/$', views.SubjectCreateView.as_view(), name='replicate'), url(r'^update/(?P[\w_-]+)/$', views.SubjectUpdateView.as_view(), name='update'), url(r'^delete/(?P[\w_-]+)/$', views.SubjectDeleteView.as_view(), name='delete'), + url(r'^view/(?P[\w_-]+)/$', views.SubjectDetailView.as_view(), name='view'), #url(r'^modal/(?P[\w_-]+)/$', views.subscribe_subject(), name='subscribe'), ] \ No newline at end of file diff --git a/subjects/views.py b/subjects/views.py index a3c9624..0b17018 100644 --- a/subjects/views.py +++ b/subjects/views.py @@ -1,6 +1,6 @@ from django.shortcuts import render, get_object_or_404 -from django.views.generic import ListView, CreateView, DeleteView, UpdateView +from django.views.generic import ListView, CreateView, DeleteView, UpdateView, TemplateView from categories.models import Category from django.core.urlresolvers import reverse_lazy from rolepermissions.verifications import has_role @@ -51,6 +51,7 @@ class HomeView(LoginRequiredMixin, ListView): def get_context_data(self, **kwargs): context = super(HomeView, self).get_context_data(**kwargs) context['title'] = _('Home') + context['show_buttons'] = True #So it shows subscribe and access buttons #bringing users tags = Tag.objects.all() @@ -99,6 +100,8 @@ class IndexView(LoginRequiredMixin, ListView): context['all'] = False context['title'] = _('My Subjects') + + context['show_buttons'] = True #So it shows subscribe and access buttons if self.kwargs.get('option'): context['all'] = True @@ -222,6 +225,19 @@ class SubjectDeleteView(LoginRequiredMixin, LogMixin, DeleteView): return reverse_lazy('subjects:index') + +class SubjectDetailView(TemplateView): + model = Subject + template_name = 'subjects/view.html' + + def get_context_data(self, **kwargs): + context = super(SubjectDetailView, self).get_context_data(**kwargs) + context['subject'] = get_object_or_404(Subject, slug = self.kwargs.get('slug')) + context['show_buttons'] = False #So it doesn't show subscribe and access buttons + + + return context + def subscribe_subject(request, subject_slug): subject = get_object_or_404(Subject, slug= subject_slug) subject.students.add(request.user) -- libgit2 0.21.2