1 files changed, 6 insertions, 7 deletions
diff --git a/jm2l/views.py b/jm2l/views.py
index e3485ae..f5dc1b3 100644
--- a/jm2l/views.py
+++ b/jm2l/views.py
@@ -6,6 +6,7 @@ from pyramid.response import Response
 from pyramid.view import notfound_view_config, forbidden_view_config
 from pyramid.view import view_config
 from pyramid_mailer import get_mailer
+from pyramid_mailer.message import Attachment, Message
 from mako.template import Template
 # Import Web Forms
 from .forms import *
@@ -18,10 +19,8 @@ from slugify import slugify
 from icalendar import Calendar
 from pytz import timezone
 from icalendar import Event as Evt
-from pyramid_mailer import get_mailer
-from pyramid_mailer.message import Attachment, Message
 # Then, standard libs
-import webhelpers.paginate as paginate
+import paginate
 import unicodedata
 import time
 import datetime
@@ -87,8 +86,8 @@ def JSON_User_Request(request):
     # Query database
     Users = DBSession.query(User.uid, User.nom, User.prenom)\
         .filter(User.slug.contains( remove_accents(UserQuery) ))
-    page_url = paginate.PageURL_WebOb(request)
-    records = paginate.Page(Users, current_page, url=page_url, items_per_page=pageSize)
+    records = paginate.Page(Users, current_page, items_per_page=pageSize,
+                            url_maker=lambda p: "%s?page=%s" % (request.application_url, p))
     ListMatchUser = map( lambda u:{"id": u.uid, "text":"%s %s" % ( u.prenom, u.nom )}, records )
     return { "Results": ListMatchUser, "Total":records.item_count,
             "logged_in":request.authenticated_userid }
@@ -112,8 +111,8 @@ def JSON_Tiers_Request(request):
     # Query database
     JTiers = DBSession.query(Tiers.uid, Tiers.name)\
         .filter(Tiers.slug.contains( remove_accents(TiersQuery) ))
-    page_url = paginate.PageURL_WebOb(request)
-    records = paginate.Page(JTiers, current_page, url=page_url, items_per_page=pageSize)
+    records = paginate.Page(JTiers, current_page, items_per_page=pageSize,
+                            url_maker=lambda p: "%s?page=%s" % (request.application_url, p))
     ListMatchTiers = map( lambda t:{"id": t.uid, "text": t.name }, records )
     return { "Results": ListMatchTiers, "Total":records.item_count,
             "logged_in":request.authenticated_userid }