created subject detail view where it shows it topics

Felipe Henrique de Almeida Bormann
1 parent f35e39d7
Showing 4 changed files with 57 additions and 11 deletions Show diff stats
subjects/templates/subjects/subject_card.html
subjects/templates/subjects/view.html
subjects/urls.py
subjects/views.py
@@ -49,11 +49,14 @@
             </div>
             <p>{{subject.description_brief|safe}}</p>
-                          
-            {% 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 %}
-                <a href="#" class="access-subject btn btn-primary btn-raised"> {% trans "Access Subject" %}</a>
-            {% else %}
-                <a href="#" class="subscribe-subject btn btn-primary btn-raised"> {% trans "Subscribe to Subject" %}</a>
+            {% 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 %}
+                    <a href="{% url 'subjects:view' subject.slug %}" class="access-subject btn btn-primary btn-raised"> {% trans "Access Subject" %}</a>
+                {% else %}
+                    <a href="#" class="subscribe-subject btn btn-primary btn-raised"> {% trans "Subscribe to Subject" %}</a>
+                {% endif %}
+
             {% endif %}
         </div>
     </div>
@@ -107,11 +110,14 @@
             </div>
             <p>{{subject.description_brief|safe}}</p>
-                          
-            {% 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   %}
-                <a href="#" class="access-subject btn btn-primary btn-raised"> {% trans "Access Subject" %}</a>
-            {% else %}
-                <a href="#" class="subscribe-subject btn btn-primary btn-raised"> {% trans "Subscribe to Subject" %}</a>
+             {% 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 %}
+                    <a href="{% url 'subjects:view' subject.slug %}" class="access-subject btn btn-primary btn-raised"> {% trans "Access Subject" %}</a>
+                {% else %}
+                    <a href="#" class="subscribe-subject btn btn-primary btn-raised"> {% trans "Subscribe to Subject" %}</a>
+                {% endif %}
+
             {% endif %}
         </div>
     </div>
@@ -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
@@ -9,5 +9,6 @@ urlpatterns = [
 	url(r'^replicate/(?P<subject_slug>[\w_-]+)/$', views.SubjectCreateView.as_view(), name='replicate'),
 	url(r'^update/(?P<slug>[\w_-]+)/$', views.SubjectUpdateView.as_view(), name='update'),
 	url(r'^delete/(?P<slug>[\w_-]+)/$', views.SubjectDeleteView.as_view(), name='delete'),
+	url(r'^view/(?P<slug>[\w_-]+)/$', views.SubjectDetailView.as_view(), name='view'),
 	#url(r'^modal/(?P<subject_slug>[\w_-]+)/$', views.subscribe_subject(), name='subscribe'),
 ]
 \ No newline at end of file
 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)
	@@ -0,0 +1,23 @@		@@ -0,0 +1,23 @@
		1	+{% extends 'categories/home.html' %}
		2	+
		3	+{% load static i18n pagination %}
		4	+{% load django_bootstrap_breadcrumbs %}
		5	+
		6	+{% block javascript%}
		7	+ {{ block.super }}
		8	+
		9	+{% endblock%}
		10	+
		11	+{% block breadcrumbs %}
		12	+ {{ block.super }}
		13	+
		14	+{% endblock %}
		15	+
		16	+
		17	+{% block content %}
		18	+
		19	+ {% include "subjects/subject_card.html" %}
		20	+
		21	+
		22	+
		23	+{% endblock content %}
0	\ No newline at end of file	24	\ No newline at end of file