[gentoo-commits] proj/gentoo-packages:master commit in: gpackages/apps/generic/templatetags/

[gentoo-commits] proj/gentoo-packages:master commit in: gpackages/apps/generic/templatetags/

[Slava Bacherikov]

commit:     f1853fc05873885eb9a154fd9626eaadc2e42c64
Author:     Slava Bacherikov <slava <AT> bacher09 <DOT> org>
AuthorDate: Sat Jun 30 19:45:11 2012 +0000
Commit:     Slava Bacherikov <slava <AT> bacherikov <DOT> org <DOT> ua>
CommitDate: Sat Jun 30 19:45:11 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-packages.git;a=commit;h=f1853fc0

Fix litle bug in paginator tag

---
 gpackages/apps/generic/templatetags/paginator.py |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/gpackages/apps/generic/templatetags/paginator.py b/gpackages/apps/generic/templatetags/paginator.py
index c856f9c..e025bc5 100644
--- a/gpackages/apps/generic/templatetags/paginator.py
+++ b/gpackages/apps/generic/templatetags/paginator.py
@@ -61,6 +61,7 @@ def get_r_range(m_end, num_pages, num):
 def paginator(page, num_middle, num_first, n_a_p = True, all_num = 0):
     paginator = page.paginator
     num_pages = paginator.num_pages
+    is_paginated = True if num_pages > 1 else False
     if all_num >= num_pages:
         m_start, m_end = 1, num_pages
         first, last = (), ()
@@ -74,7 +75,7 @@ def paginator(page, num_middle, num_first, n_a_p = True, all_num = 0):
     middle = get_pages_in_range(m_start, m_end, page.number)
 
     return {'page_obj': page,
-            'is_paginated': bool(page),
+            'is_paginated': is_paginated,
             'paginator': paginator,
             'middle_pages': middle,
             'first_pages': first,

[gentoo-commits] proj/gentoo-packages:master commit in: gpackages/apps/generic/templatetags/

[Slava Bacherikov]

commit:     c0fbb915653a916147570d28171c4d4199a80b8e
Author:     Slava Bacherikov <slava <AT> bacher09 <DOT> org>
AuthorDate: Thu Aug 16 23:41:23 2012 +0000
Commit:     Slava Bacherikov <slava <AT> bacherikov <DOT> org <DOT> ua>
CommitDate: Thu Aug 16 23:41:23 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-packages.git;a=commit;h=c0fbb915

Fix extra args in some templatetags

---
 gpackages/apps/generic/templatetags/active_link.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/gpackages/apps/generic/templatetags/active_link.py b/gpackages/apps/generic/templatetags/active_link.py
index d735477..506b4eb 100644
--- a/gpackages/apps/generic/templatetags/active_link.py
+++ b/gpackages/apps/generic/templatetags/active_link.py
@@ -15,7 +15,7 @@ def active_str(context, url):
 def active_link(context, url_name, text, id = None, *args, **kwargs):
     request = context['request']
     try:
-        url = reverse(url_name, *args, **kwargs)
+        url = reverse(url_name, args = args, kwargs = kwargs)
     except NoReverseMatch:
         url = '#'