コミット: 64dc26efd6bd0f5dcd053ee5be4a2b6f06bbe245 - allura (git)

allura

コミットメタ情報

• リビジョン: 64dc26efd6bd0f5dcd053ee5be4a2b6f06bbe245 (tree)
• 日時: 2012-03-22 23:39:12
• 作者: Jenny Steele <jsteele@geek...>
• コミッター: Tim Van Steenburgh

ログメッセージ

[#3920] Results should now be consistent between tracker index page and its bulk edit page

Signed-off-by: Jenny Steele <[e-mail]>

変更サマリ

• modified: ForgeTracker/forgetracker/model/ticket.py
• modified: ForgeTracker/forgetracker/templates/tracker/index.html
• modified: ForgeTracker/forgetracker/tests/functional/test_root.py
• modified: ForgeTracker/forgetracker/tracker_main.py

差分

--- a/ForgeTracker/forgetracker/model/ticket.py
+++ b/ForgeTracker/forgetracker/model/ticket.py
@@ -85,7 +85,7 @@ class Globals(MappedClass):
     @property
     def not_closed_mongo_query(self):
         return dict(
-            status={'$in': list(self.set_of_open_status_names)})
+            status={'$nin': list(self.set_of_closed_status_names)})
 
     @property
     def closed_query(self):

--- a/ForgeTracker/forgetracker/templates/tracker/index.html
+++ b/ForgeTracker/forgetracker/templates/tracker/index.html
@@ -16,7 +16,7 @@
     {{c.subscribe_form.display(value=subscribed, action='subscribe', style='icon')}}
   {% endif %}
   {% if allow_edit %}
-    <a href="{{tg.url(c.app.url+'edit/', dict(q=url_q, limit=limit, sort=sort, page=page))}}" title="Bulk Edit"><b data-icon="{{g.icons['pencil'].char}}" class="ico {{g.icons['pencil'].css}}"></b></a>
+    <a href="{{tg.url(c.app.url+'edit/', dict(q=url_q, limit=limit, sort=url_sort, page=page))}}" title="Bulk Edit"><b data-icon="{{g.icons['pencil'].char}}" class="ico {{g.icons['pencil'].css}}"></b></a>
   {% endif %}
 {% endblock %}
 

--- a/ForgeTracker/forgetracker/tests/functional/test_root.py
+++ b/ForgeTracker/forgetracker/tests/functional/test_root.py
@@ -4,7 +4,7 @@ import Image, StringIO
 import allura
 
 from mock import patch
-from nose.tools import assert_true, assert_false, assert_equal
+from nose.tools import assert_true, assert_false, assert_equal, assert_in
 from formencode.variabledecode import variable_encode
 
 from alluratest.controller import TestController
@@ -692,6 +692,25 @@ class TestFunctionalController(TrackerTestController):
         r = self.app.get('/bugs/1/', dict(page=1, limit=2))
         assert_true('Page 2 of 2' in r)
 
+    def test_bulk_edit_index(self):
+        self.new_ticket(summary='test first ticket', status='open')
+        self.new_ticket(summary='test second ticket', status='accepted')
+        self.new_ticket(summary='test third ticket', status='closed')
+        ThreadLocalORMSession.flush_all()
+        M.MonQTask.run_ready()
+        ThreadLocalORMSession.flush_all()
+        response = self.app.get('/p/test/bugs/?sort=summary+asc')
+        ticket_rows = response.html.find('table', {'class':'ticket-list'}).find('tbody').findAll('tr')
+        assert_in('test first ticket', str(ticket_rows[0].findAll('td')[1]))
+        assert_in('test second ticket', str(ticket_rows[1].findAll('td')[1]))
+        edit_link = response.html.find('a',{'title':'Bulk Edit'})
+        expected_link = "/p/test/bugs/edit/?q=%21status%3Awont-fix+%26%26+%21status%3Aclosed&sort=snippet_s+asc&limit=25&page=0"
+        assert_equal(expected_link, edit_link['href'])
+        response = self.app.get(edit_link['href'])
+        ticket_rows = response.html.find('tbody', {'class':'ticket-list'}).findAll('tr')
+        assert_in('test first ticket', str(ticket_rows[1].findAll('td')[2]))
+        assert_in('test second ticket', str(ticket_rows[0].findAll('td')[2]))
+
 class TestMilestoneAdmin(TrackerTestController):
     def _post(self, params, **kw):
         params['open_status_names'] = 'aa bb'

--- a/ForgeTracker/forgetracker/tracker_main.py
+++ b/ForgeTracker/forgetracker/tracker_main.py
@@ -379,10 +379,26 @@ class RootController(BaseController):
                     count=count, q=q, limit=limit, page=page, sort=sort,
                     solr_error=solr_error, **kw)
 
+    def _mongo_col_to_solr_col(self, name):
+        if name == 'ticket_num':
+            return 'ticket_num_i'
+        elif name == 'summary':
+            return 'snippet_s'
+        elif name == '_milestone':
+            return 'milestone_s'
+        elif name == 'status':
+            return 'status_s'
+        elif name == 'assigned_to':
+            return 'assigned_to_s'
+        else:
+            for field in c.app.globals.sortable_custom_fields_shown_in_search():
+                if name == field['name']:
+                    return field['sortable_name']
+
     @with_trailing_slash
     @h.vardec
     @expose('jinja:forgetracker:templates/tracker/index.html')
-    def index(self, limit=25, columns=None, page=0, sort='ticket_num_i asc', **kw):
+    def index(self, limit=25, columns=None, page=0, sort='ticket_num desc', **kw):
         kw.pop('q', None) # it's just our original query mangled and sent back to us
         result = TM.Ticket.paged_query(c.app.globals.not_closed_mongo_query,
                                         sort=sort, limit=int(limit),
@@ -392,6 +408,11 @@ class RootController(BaseController):
         result['allow_edit'] = has_access(c.app, 'write')()
         result['help_msg'] = c.app.config.options.get('TicketHelpSearch')
         result['url_q'] = c.app.globals.not_closed_query
+        result['url_sort'] = ''
+        if sort:
+            sort_split = sort.split(' ')
+            solr_col = self._mongo_col_to_solr_col(sort_split[0])
+            result['url_sort'] = '%s %s' % (solr_col, sort_split[1])
         c.ticket_search_results = W.ticket_search_results
         return result