Merge branch 'issue-89'

foxmask · Jun 14, 2015 · de6478d · de6478d
2 parents 2767630 + e7c3edc
commit de6478d
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/django_th/templates/home.html b/django_th/templates/home.html
@@ -26,15 +26,15 @@ <h2><span class="glyphicon glyphicon-flash"></span>{% trans "My Triggers" %}</h2
         <div class="col-md-12 ">
             <ul class="pagination">
                 {% if page_obj.has_previous %}
-                    <li><a href="{% url 'home' %}?page={{ page_obj.previous_page_number }}">{% trans "previous" %}</a></li>
+                    <li><a href="{{ page_link }}?page={{ page_obj.previous_page_number }}">{% trans "previous" %}</a></li>
                 {% endif %}
                     <li class="active"><a >
                     {% blocktrans with page_number=page_obj.number total_of_pages=page_obj.paginator.num_pages %}
                     Page {{ page_number }} of {{ total_of_pages }}
                     {% endblocktrans %}</a>
                     </li>
                 {% if page_obj.has_next %}
-                    <li><a href="{% url 'home' %}?page={{ page_obj.next_page_number }}">{% trans "next" %}</a></li>
+                    <li><a href="{{ page_link }}?page={{ page_obj.next_page_number }}">{% trans "next" %}</a></li>
                 {% endif %}
             </ul>
         </div>

diff --git a/django_th/views.py b/django_th/views.py
@@ -233,6 +233,18 @@ def get_context_data(self, **kw):
         triggers_enabled = triggers_disabled = services_activated = ()
 
         context = super(TriggerListView, self).get_context_data(**kw)
+
+        if 'trigger_filtered_by' in self.kwargs:
+            page_link = reverse('trigger_filter_by',
+                                kwargs={'trigger_filtered_by':
+                                        self.kwargs['trigger_filtered_by']})
+        elif 'trigger_ordered_by' in self.kwargs:
+            page_link = reverse('trigger_order_by',
+                                kwargs={'trigger_ordered_by':
+                                        self.kwargs['trigger_ordered_by']})
+        else:
+            page_link = reverse('home')
+
         if self.request.user.is_authenticated():
             # get the enabled triggers
             triggers_enabled = TriggerService.objects.filter(
@@ -261,6 +273,8 @@ def get_context_data(self, **kw):
         """
         context['nb_services'] = services_activated
 
+        context['page_link'] = page_link
+
         return context