From 8669be096a8a950fe0d23d7b88a8e6b6c37b2b41 Mon Sep 17 00:00:00 2001 From: ber Date: Tue, 19 Jul 2011 07:54:22 +0000 Subject: [PATCH] issue2550695: 'No sort or group' settings not retained when editing queries. Reported and fixed by John Kristensen. Tested by Satchidanand Haridas. git-svn-id: http://svn.roundup-tracker.org/svnroot/roundup/roundup/trunk@4642 57a73879-2fb5-44c3-a270-3262357dd7e2 --- CHANGES.txt | 4 ++++ share/roundup/templates/classic/html/issue.search.html | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 9be77b8..1c5281d 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -8,6 +8,10 @@ Entries without name were done by Richard Jones. Features: Fixed: +issue2550695: 'No sort or group' settings not retained when editing queries. + Reported and fixed by John Kristensen. Tested by Satchidanand Haridas. + (Bernhard) + 2011-07-15 1.4.19 (r4638) Features: diff --git a/share/roundup/templates/classic/html/issue.search.html b/share/roundup/templates/classic/html/issue.search.html index 27e2bc7..3906387 100644 --- a/share/roundup/templates/classic/html/issue.search.html +++ b/share/roundup/templates/classic/html/issue.search.html @@ -12,10 +12,10 @@ cols python:request.columns or 'id activity title status assignedto'.split(); sort_on python:request.sort and request.sort[0] or nothing; sort_desc python:sort_on and sort_on[0] == '-'; - sort_on python:(sort_on and sort_on[1]) or 'activity'; + sort_on python:(sort_on and sort_on[1]) or (not request.nodeid and 'activity') or ''; group_on python:request.group and request.group[0] or nothing; group_desc python:group_on and group_on[0] == '-'; - group_on python:(group_on and group_on[1]) or 'priority'; + group_on python:(group_on and group_on[1]) or (not request.nodeid and 'priority') or ''; search_input templates/page/macros/search_input; search_date templates/page/macros/search_date; @@ -168,8 +168,8 @@ No Sort or group:     - - + + -- 2.30.2