Mercurial Mercurial > py_tasks_melange / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix get args construction when there are multiple lists on the page
authorSverre Rabbelier <srabbelier@gmail.com>
Sun, 01 Feb 2009 22:48:48 +0000
changeset 1166 558bd62ee9d4
parent 1165 4db62684ce13
child 1167 346117bd30cf
Fix get args construction when there are multiple lists on the page It is now possible to go back and forward through the liast, and specify the limit (both offset and limit can be done per list). The JS driving the list boxes is buggy, if visiting an url like: http://localhost:8080/notification/list?limit_0=10 And then change the limit in the second checkbox, it directs to: http://localhost:8080/notification/list?limit_1=25 Whereas it should redirect to: http://localhost:8080/notification/list?limit_0=10&limit_1=25 The logic _does_ work properly when the limit of the changed list is already present in the url. Patch by: Sverre Rabbelier
app/soc/views/helper/lists.py file | annotate | diff | comparison | revisions 
--- a/app/soc/views/helper/lists.py	Sun Feb 01 22:44:14 2009 +0000
+++ b/app/soc/views/helper/lists.py	Sun Feb 01 22:48:48 2009 +0000
@@ -53,7 +53,7 @@
   return DEF_PAGINATION
 
 
-def getLimitAndOffset(request, idx):
+def getLimitAndOffset(request, offset_key, limit_key):
   """Retrieves, converts and validates offset and limit values
 
   Args:
@@ -64,8 +64,8 @@
     updated offset and limit values
   """
 
-  offset = request.GET.get('offset_%d' % idx)
-  limit = request.GET.get('limit_%d' % idx)
+  offset = request.GET.get(offset_key)
+  limit = request.GET.get(limit_key)
 
   if offset is None:
     offset = ''
@@ -90,6 +90,16 @@
   return limit, offset
 
 
+def generateLinkFromGetArgs(request, offset_and_limits):
+  """Constructs the get args for the url.
+  """
+
+  args = ["%s=%s" % (k, v) for k, v in offset_and_limits.iteritems()]
+  link_suffix = '?' + '&'.join(args)
+
+  return request.path + link_suffix
+
+
 def getListContent(request, params, filter=None, idx=0):
   """Returns a dict with fields used for rendering lists.
 
@@ -119,9 +129,11 @@
 
   logic = params['logic']
 
-  limit, offset = getLimitAndOffset(request, idx)
-  arg_name = 'limit_%d' % idx
-  pagination_form = makePaginationForm(request, limit, arg_name)
+  offset_key = 'offset_%d' % idx
+  limit_key = 'limit_%d' % idx
+
+  limit, offset = getLimitAndOffset(request, offset_key, limit_key)
+  pagination_form = makePaginationForm(request, limit, limit_key)
 
   # Fetch one more to see if there should be a 'next' link
   data = logic.getForFields(filter=filter, limit=limit+1, offset=offset)
@@ -133,16 +145,28 @@
 
   newest = next = prev = ''
 
+  get_args = request.GET
+  offset_and_limits = {}
+
+  for key, value in get_args.iteritems():
+    if key.startswith('offset_') or key.startswith('limit_'):
+      offset_and_limits[key] = value
+
   if more:
-    next = request.path + '?offset_%d=%d&limit_%d=%d' % (
-        idx, offset+limit, idx, limit)
+    offset_and_limits[offset_key] = offset+limit
+    offset_and_limits[limit_key] = limit
+    next = generateLinkFromGetArgs(request, offset_and_limits)
 
   if offset > 0:
-    prev = request.path + '?offset_%d=%d&limit_%d=%d' % (
-        idx, max(0, offset-limit), idx, limit)
+    offset_and_limits[offset_key] = max(0, offset-limit)
+    offset_and_limits[limit_key] = limit
+    prev = generateLinkFromGetArgs(request, offset_and_limits)
 
   if offset > limit:
-    newest = request.path + '?limit_%d=%d' % (idx, limit)
+    del offset_and_limits[offset_key]
+    offset_and_limits[limit_key] = limit
+
+    newest = generateLinkFromGetArgs(request, offset_and_limits)
 
   content = {
       'data': data,
py_tasks_melange