Ticket #1163: trac-0.11-b1-sort-roadmap-by-parent-component.patch

trac/ticket/roadmap.py

@@ -277 +277 @@
         args = {'milestone': name, grouped_by: group, 'group': 'status'}
         args.update(extra_args)
         return req.href.query(args)
+    if grouped_by == 'component' and group is not None:
+        group = '^' + group
     return {'stats': stat,
             'stats_href': query_href(stat.qry_args),
             'interval_hrefs': [query_href(interval['qry_args'])
@@ -729 +731 @@
                                        "ORDER BY %s" % (by, by))
                         groups = [row[0] for row in cursor]
 
+            # Special case if we are sorting by component.
+            if by == 'component':
+                previous = ''
+                newgroups = []
+                for component in groups:
+                    previous = component.split('/')[0]
+                    if previous not in newgroups:
+                        newgroups.append(previous)
+                groups = newgroups;
+
             max_count = 0
             group_stats = []
 
             for group in groups:
-                group_tickets = [t for t in tickets if t[by] == group]
+                if by != 'component':
+                    group_tickets = [t for t in tickets if t[by] == group]
+                else:
+                    group_tickets = [t for t in tickets if group in t[by]]
                 if not group_tickets:
                     continue