From 4536c27f5f75188efb32b27aa79c6b53f372c0e9 Mon Sep 17 00:00:00 2001
From: Zambom <erikzambom@hotmail.com>
Date: Thu, 19 Jan 2017 02:24:22 -0200
Subject: [PATCH] Adding category breadcrumb go back (only in subject view for now)

---
 subjects/templates/subjects/list.html | 14 ++++++++++++++
 subjects/templates/subjects/view.html |  2 +-
 subjects/urls.py                      |  1 +
 subjects/utils.py                     | 11 +++++++++++
 subjects/views.py                     | 44 ++++++++++++++++++++++++++++++++++++++++----
 5 files changed, 67 insertions(+), 5 deletions(-)

diff --git a/subjects/templates/subjects/list.html b/subjects/templates/subjects/list.html
index 5c40a13..fbca9be 100644
--- a/subjects/templates/subjects/list.html
+++ b/subjects/templates/subjects/list.html
@@ -90,6 +90,7 @@
                             <div id="{{category.slug}}" class="panel-collapse panel-body collapse category-panel-content">
                                 <input type="hidden" class="log_url" value="{% url 'categories:view_log' category.id %}" />
                                 <input type="hidden" class="log_id" value="" />
+                                
                                 {% if category.coordinators.all|length > 0  %}
                                     <h4><b>{% trans "Coordinator(s) " %}: </b>
                                         {{ category.coordinators.all|join:', ' }}
@@ -193,4 +194,17 @@
     <div id="modal_subject"></div>
     
     <script type="text/javascript" src="{% static 'js/course.js' %}"></script>
+    <script type="text/javascript">
+        $(function (){
+            var cat_slug = "{{ cat_slug }}"
+
+            if (cat_slug != "") {
+                $("#" + cat_slug).collapse('show');
+
+                $('html, body').animate({
+                    scrollTop: $("#" + cat_slug).parent().offset().top
+                }, 2000);
+            }
+        });
+    </script>
 {% endblock %}
diff --git a/subjects/templates/subjects/view.html b/subjects/templates/subjects/view.html
index c276275..b9ed8f9 100644
--- a/subjects/templates/subjects/view.html
+++ b/subjects/templates/subjects/view.html
@@ -9,7 +9,7 @@
 
 {% block breadcrumbs %}
     {{ block.super }}
-    {% breadcrumb subject.category 'subjects:index' %}
+    {% breadcrumb subject.category 'subjects:cat_view' subject.category.slug %}
     {% breadcrumb subject 'subjects:view' subject.slug %}
 {% endblock %}
 
diff --git a/subjects/urls.py b/subjects/urls.py
index de71e12..536cda8 100644
--- a/subjects/urls.py
+++ b/subjects/urls.py
@@ -4,6 +4,7 @@ from . import views
 urlpatterns = [
 	url(r'^home/$', views.HomeView.as_view(), name='home'),
 	url(r'^$', views.IndexView.as_view(), name='index'),
+	url(r'^category/(?P<slug>[\w_-]+)/$', views.IndexView.as_view(), name='cat_view'),
 	url(r'^(?P<option>[\w_-]+)/$', views.IndexView.as_view(), name='index'),
 	url(r'^create/(?P<slug>[\w_-]+)/$', views.SubjectCreateView.as_view(), name='create'),
 	url(r'^replicate/(?P<subject_slug>[\w_-]+)/$', views.SubjectCreateView.as_view(), name='replicate'),
diff --git a/subjects/utils.py b/subjects/utils.py
index a1d99f5..3f4a9e9 100644
--- a/subjects/utils.py
+++ b/subjects/utils.py
@@ -18,6 +18,17 @@ def has_professor_profile(user, category):
 
 	return False
 
+def get_category_page(categories, slug, per_page):
+	total = 1
+
+	for category in categories:
+		if category.slug == slug:
+			return total / per_page + 1
+
+		total += 1
+
+	return 1
+
 def count_subjects( user, all_subs = True):
 	total = 0
 	pk = user.pk
diff --git a/subjects/views.py b/subjects/views.py
index eff5d51..057d476 100644
--- a/subjects/views.py
+++ b/subjects/views.py
@@ -26,7 +26,7 @@ import time
 import datetime
 from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
 from .forms import CreateSubjectForm
-from .utils import has_student_profile, has_professor_profile, count_subjects
+from .utils import has_student_profile, has_professor_profile, count_subjects, get_category_page
 from users.models import User
 
 
@@ -55,6 +55,7 @@ class HomeView(LoginRequiredMixin, ListView):
         #bringing users
         tags = Tag.objects.all()
         context['tags'] = tags
+
         return context
 
 
@@ -67,8 +68,7 @@ class IndexView(LoginRequiredMixin, ListView):
     context_object_name = 'categories'
     paginate_by = 10
 
-    def get_queryset(self):
-        
+    def get_queryset(self):        
         if self.request.user.is_staff:
             categories = Category.objects.all().order_by('name')
         else:
@@ -94,6 +94,39 @@ class IndexView(LoginRequiredMixin, ListView):
 
         return categories
 
+    def paginate_queryset(self, queryset, page_size): 
+        paginator = self.get_paginator(
+            queryset, page_size, orphans=self.get_paginate_orphans(),
+            allow_empty_first_page=self.get_allow_empty())
+        
+        page_kwarg = self.page_kwarg
+        
+        page = self.kwargs.get(page_kwarg) or self.request.GET.get(page_kwarg) or 1
+        
+        if self.kwargs.get('slug'):
+            categories = queryset
+
+            paginator = Paginator(categories, self.paginate_by)
+
+            page = get_category_page(categories, self.kwargs.get('slug'), self.paginate_by)
+        
+        try:
+            page_number = int(page)
+        except ValueError:
+            if page == 'last':
+                page_number = paginator.num_pages
+            else:
+                raise Http404(_("Page is not 'last', nor can it be converted to an int."))
+        
+        try:
+            page = paginator.page(page_number)
+            return (paginator, page, page.object_list, page.has_other_pages())
+        except InvalidPage as e:
+            raise Http404(_('Invalid page (%(page_number)s): %(message)s') % {
+                'page_number': page_number,
+                'message': str(e)
+            })
+
     def render_to_response(self, context, **response_kwargs):
         if self.request.user.is_staff:
             context['page_template'] = "categories/home_admin_content.html"
@@ -116,11 +149,14 @@ class IndexView(LoginRequiredMixin, ListView):
 
         context['show_buttons'] = True #So it shows subscribe and access buttons
         context['totals'] = self.totals
-            
+        
         if self.kwargs.get('option'):
             context['all'] = True
             context['title'] = _('All Subjects')
 
+        if self.kwargs.get('slug'):
+            context['cat_slug'] = self.kwargs.get('slug')
+
         context['subjects_menu_active'] = 'subjects_menu_active'
 
         return context
--
libgit2 0.21.2