Display tickets twice in `Query results`.

[anonymous]

Sequence:

1. Show Custom Query from link in Milestone. (Status are accepted, assigned, new and reopened. Group by Status.)
2. Click Ticket and go.
3. Close the ticket.
4. Click Back to Query navigation.

and also, there is missing order for group (between cache and query returns).

I have a patch against source:trunk@6397. Review it, please.

[anonymous]

This is patch

[anonymous]

I forgot to put the milestone

[osimons]

Please don't set or change milestones as anonymous - certainly without explanation.

That said, I've looked at it and verified the problem where a new group is added based on changes to tickets in an 'active' query - it does not get sorted correctly. The patch is essentially the same, except compatibility with Python 2.3. As the 'group by' list is likely not going to be all that long, I don't see the need to add a variable to test if we need sorting.

trac/ticket/query.py

@@ -30 +30 @@
 from trac.ticket.api import TicketSystem
 from trac.ticket.model import Ticket
 from trac.util import Ranges
-from trac.util.compat import groupby
+from trac.util.compat import groupby, sorted
 from trac.util.datefmt import to_timestamp, utc
 from trac.util.html import escape, unescape
 from trac.util.text import shorten_line, CRLF
@@ -525 +525 @@
             if self.group:
                 group_key = ticket[self.group]
                 groups.setdefault(group_key, []).append(ticket)
-                if not groupsequence or groupsequence[-1] != group_key:
+                if not groupsequence or group_key not in groupsequence:
                     groupsequence.append(group_key)
+        groupsequence = sorted(groupsequence, reverse=self.groupdesc)
         groupsequence = [(value, groups[value]) for value in groupsequence]
 
         return {'query': self,

It seems to work correctly with the patch.

I'll leave it for a couple of days to see if there are comments on the approach, if not I'll commit.

[osimons]

Replying to osimons:

... - it does not get sorted correctly.

And of course; I also got double groups listing the same tickets again. The patch solves this main issue, naturally.

[anonymous]

Thank you for the review. I think the patch is right, so please commit.

[osimons]

Committed as [6471].