提交: c95fc286e3c99b09ebd8c5c5821f4a688cae96c5 - allura (git)

allura

Commit MetaInfo

• 修訂: c95fc286e3c99b09ebd8c5c5821f4a688cae96c5 (tree)
• 時間: 2010-05-29 00:21:18
• 作者: Jenny Steele <jsteele@geek...>
• Commiter: Jenny Steele

Log Message

[#430] Preferred number of results per page is now saved

Change Summary

• modified: ForgeTracker/forgetracker/templates/search.html
• modified: ForgeTracker/forgetracker/tests/functional/test_root.py
• modified: ForgeTracker/forgetracker/tracker_main.py
• modified: pyforge/pyforge/model/auth.py

差異

--- a/ForgeTracker/forgetracker/templates/search.html
+++ b/ForgeTracker/forgetracker/templates/search.html
@@ -57,7 +57,7 @@
     </table>
     <p>Showing ${limit} results per page. </p>
     <ul class="per_page">
-      <li py:for="per_page in [10, 25, 50, 100]">
+      <li py:for="per_page in [25, 50, 100, 250]">
       <a href="${tg.url(request.path_info, dict(q=q, limit=per_page))}" py:strip="limit == per_page">${per_page}</a>
       </li>
     </ul>

--- a/ForgeTracker/forgetracker/tests/functional/test_root.py
+++ b/ForgeTracker/forgetracker/tests/functional/test_root.py
@@ -421,6 +421,17 @@ class TestFunctionalController(TestController):
         new_date = ticket.mod_date
         assert new_date > old_date
 
+    def test_paging_prefs_saved(self):
+        req = self.app.get('/bugs/search/')
+        'Showing 100 results per page' not in req
+        'Showing 25 results per page' in req
+        req = self.app.get('/bugs/search/?limit=100')
+        'Showing 100 results per page' in req
+        'Showing 25 results per page' not in req
+        req = self.app.get('/bugs/search/')
+        'Showing 100 results per page' in req
+        'Showing 25 results per page' not in req
+
 
 def sidebar_contains(response, text):
     sidebar_menu = response.html.find('ul', attrs={'id': 'sidebarmenu'})

--- a/ForgeTracker/forgetracker/tracker_main.py
+++ b/ForgeTracker/forgetracker/tracker_main.py
@@ -8,6 +8,7 @@ from urllib import urlencode, unquote
 # Non-stdlib imports
 import pkg_resources
 import Image
+import tg
 from tg import tmpl_context
 from tg import expose, validate, redirect, flash
 from tg import request, response
@@ -211,7 +212,18 @@ class RootController(object):
             count<=limit in the result
         limit=-1 is NOT recognized as 'all'.  500 is a reasonable limit.
         """
-        limit = limit or 10
+
+        if limit:
+            if c.user in (None, User.anonymous()):
+                tg.session['results_per_page'] = limit
+                tg.session.save()
+            else:
+                c.user.preferences.results_per_page = limit
+        else:
+            if c.user in (None, User.anonymous()):
+                limit = 'results_per_page' in tg.session and tg.session['results_per_page'] or 25
+            else:
+                limit = c.user.preferences.results_per_page or 25
         sort = sort or 'ticket_num_i desc'
         page = max(page, 0)
         start = page * limit

--- a/pyforge/pyforge/model/auth.py
+++ b/pyforge/pyforge/model/auth.py
@@ -150,6 +150,7 @@ class User(MappedClass):
     password=FieldProperty(str)
     projects=FieldProperty([S.ObjectId])
     preferences=FieldProperty(dict(
+            results_per_page=int,
             email_address=str,
             email_format=str))
     tool_preferences=FieldProperty({str:{str:None}}) # full mount point: prefs dict