1.1.4dev: merged [13755] from 1.0-stable (fix for #11920)

git-svn-id: http://trac.edgewall.org/intertrac/log:/trunk@13756 af82e41b-90c4-0310-8c96-b1721e28e2e2

Author: jomae

trac/ticket/query.py

@@ -945,9 +945,11 @@ def process_request(self, req):
         order = args.get('order')
         if isinstance(order, (list, tuple)):
             order = order[0] if order else None
+        group = args.get('group')
+        if isinstance(group, (list, tuple)):
+            group = group[0] if group else None
         query = Query(self.env, report_id,
-                      constraints, cols, order,
-                      'desc' in args, args.get('group'),
+                      constraints, cols, order, 'desc' in args, group,
                       'groupdesc' in args, 'verbose' in args,
                       rows,
                       args.get('page'),

trac/ticket/tests/query.py

@@ -15,7 +15,7 @@
 from trac.ticket.model import Ticket
 from trac.ticket.query import Query, QueryModule, TicketQueryMacro
 from trac.util.datefmt import utc
-from trac.web.api import arg_list_to_args
+from trac.web.api import arg_list_to_args, parse_arg_list
 from trac.web.chrome import web_context
 from trac.web.href import Href
 from trac.wiki.formatter import LinkFormatter
@@ -668,6 +668,16 @@ def setUp(self):
     def tearDown(self):
         self.env.reset_db()
 
+    def _insert_ticket(self, **attrs):
+        attrs.setdefault('reporter', 'joe')
+        attrs.setdefault('summary', 'Summary')
+        attrs.setdefault('status', 'new')
+        ticket = Ticket(self.env)
+        for name, value in attrs.iteritems():
+            ticket[name] = value
+        ticket.insert()
+        return ticket
+
     def _format_link(self, query, label):
         return str(self.query_module._format_link(self.formatter, 'query',
                                                   query, label))
@@ -677,26 +687,38 @@ def test_empty_query(self):
                          '<em class="error">[Error: Query filter requires '
                          'field and constraints separated by a "="]</em>')
 
-    def _query_with_duplicated_args(self, name, values):
-        self.req.arg_list = [(name, value) for value in values]
+    def _process_request(self, query_string):
+        self.req.arg_list = parse_arg_list(query_string)
         self.req.args = arg_list_to_args(self.req.arg_list)
         self.assertEqual(True, self.query_module.match_request(self.req))
         template, data, content_type = \
                 self.query_module.process_request(self.req)
         return data
 
     def test_duplicated_order_arguments(self):
-        # query:?order=priority&order=id
-        data = self._query_with_duplicated_args('order', ['priority', 'id'])
+        data = self._process_request('order=priority&order=id')
         self.assertEqual([], data['tickets'])
         self.assertEqual('priority', data['query'].order)
 
     def test_duplicated_report_arguments(self):
-        # query:?report=1&report=2
-        data = self._query_with_duplicated_args('report', ['1', '2'])
+        data = self._process_request('report=1&report=2')
         self.assertEqual([], data['tickets'])
         self.assertEqual('1', data['query'].id)
 
+    def test_duplicated_group_arguments(self):
+        self._insert_ticket(status='new')
+        self._insert_ticket(status='assigned')
+        data = self._process_request(
+                'group=status&group=status&order=priority')
+        self.assertNotEqual([], data['tickets'])
+        self.assertEqual(set(('new', 'assigned')),
+                         set(t['status'] for t in data['tickets']))
+        self.assertEqual(2, len(data['tickets']))
+        self.assertNotEqual([], data['groups'])
+        self.assertEqual(set(('new', 'assigned')),
+                         set(value for value, tickets in data['groups']))
+        self.assertEqual(2, len(data['groups']))
+
 
 class TicketQueryMacroTestCase(unittest.TestCase):