allura
Fork

提交

[#3920] Fixed milestone sorting on ticket search

Signed-off-by: Jenny Steele <jsteele@geek.net>

--- a/ForgeTracker/forgetracker/templates/tracker_widgets/mass_edit.html

+++ b/ForgeTracker/forgetracker/templates/tracker_widgets/mass_edit.html

		@@ -9,7 +9,7 @@
9	9	</th>
10	10	<th data-sort="ticket_num_i">#</th>
11	11	<th data-sort="snippet_s">Summary</th>
12		- <th data-sort="milestone_s">Milestone</th>
	12	+ <th data-sort="_milestone_s">Milestone</th>
13	13	<th data-sort="status_s">Status</th>
14	14	<th data-sort="assigned_to_s">Owner</th>
15	15	</tr>

--- a/ForgeTracker/forgetracker/tracker_main.py

+++ b/ForgeTracker/forgetracker/tracker_main.py

		@@ -63,13 +63,13 @@ def _mongo_col_to_solr_col(name):
63	63	elif name == 'summary':
64	64	return 'snippet_s'
65	65	elif name == '_milestone':
66		- return 'milestone_s'
	66	+ return '_milestone_s'
67	67	elif name == 'status':
68	68	return 'status_s'
69	69	elif name == 'assigned_to_username':
70	70	return 'assigned_to_s'
71	71	elif name == 'custom_fields._milestone':
72		- return 'milestone_s'
	72	+ return '_milestone_s'
73	73	else:
74	74	for field in c.app.globals.sortable_custom_fields_shown_in_search():
75	75	if name == field['name']:

		@@ -386,7 +386,7 @@ class RootController(BaseController):
386	386	if not columns:
387	387	columns = [dict(name='ticket_num', sort_name='ticket_num_i', label='Ticket Number', active=True),
388	388	dict(name='summary', sort_name='snippet_s', label='Summary', active=True),
389		- dict(name='_milestone', sort_name='milestone_s', label='Milestone', active=True),
	389	+ dict(name='_milestone', sort_name='_milestone_s', label='Milestone', active=True),
390	390	dict(name='status', sort_name='status_s', label='Status', active=True),
391	391	dict(name='assigned_to', sort_name='assigned_to_s', label='Owner', active=True)]
392	392	for field in sortable_custom_fields: