web/component.py
branchstable
changeset 3014 62ce5a139b52
parent 3013 6a40a9a72957
child 3023 7864fee8b4ec
child 3607 a7c5e62c7e00
--- a/web/component.py	Wed Aug 26 11:14:47 2009 +0200
+++ b/web/component.py	Wed Aug 26 11:15:39 2009 +0200
@@ -134,25 +134,21 @@
             return self.selected_page_link_templ % (url, content, content)
         return self.page_link_templ % (url, content, content)
 
-    def previous_link(self, params, content='<<', title=_('previous_results')):
+    def previous_link(self, path, params, content='<<', title=_('previous_results')):
         start = self.starting_from
         if not start :
             return self.no_previous_page_link
         start = max(0, start - self.page_size)
         stop = start + self.page_size - 1
-        url = self.build_url(**merge_dicts(params, {self.start_param : start,
-                                                    self.stop_param : stop,}))
-        url = xml_escape(url)
+        url = xml_escape(self.page_url(path, params, start, stop))
         return self.previous_page_link_templ % (url, title, content)
 
-    def next_link(self, params, content='>>', title=_('next_results')):
+    def next_link(self, path, params, content='>>', title=_('next_results')):
         start = self.starting_from + self.page_size
         if start >= self.total:
             return self.no_next_page_link
         stop = start + self.page_size - 1
-        url = self.build_url(**merge_dicts(params, {self.start_param : start,
-                                                    self.stop_param : stop,}))
-        url = xml_escape(url)
+        url = xml_escape(self.page_url(path, params, start, stop))
         return self.next_page_link_templ % (url, title, content)