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

diff --git a/CHANGES.txt b/CHANGES.txt
index 9be77b88f048c7b35b8b4503b5bc28e846136c08..1c5281d6af786777232e5efd6d7c3d6dd1ef6541 100644 (file)
--- 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 27e2bc7f43f134e0149dcfcc8b724280f5b607b0..39063874845b4349f0c134745af69f55f7837f8f 100644 (file)
--- 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 @@
  <th i18n:translate="">No Sort or group:</th>
  <td>&nbsp;</td>
  <td>&nbsp;</td>
- <td><input type="radio" name="@sort" value=""></td>
- <td><input type="radio" name="@group" value=""></td>
+ <td><input type="radio" name="@sort" value="" tal:attributes="checked python:sort_on == ''"></td>
+ <td><input type="radio" name="@group" value="" tal:attributes="checked python:group_on == ''"></td>
 </tr>
 
 <tr>