fix sidebar search links (patch [SF#1574467])

Author: Richard Jones

CHANGES.txt

@@ -14,6 +14,7 @@ Fixed:
 - fix sort/group direction checkbox in issue.index.html (sf bug 1593025)
 - fix error detection for non-EN locales of postgres (sf bug 1592249)
 - fix email change note rendering of multiline properties (sf patch 1575223)
+- fix sidebar search links (sf patch 1574467)
 
 
 2006-10-07 1.2.1

templates/classic/html/page.html

@@ -39,7 +39,7 @@ <h2><span metal:define-slot="body_title">body title</span></h2>
        <input type="hidden" name="@sort" value="activity"/>
        <input type="hidden" name="@group" value="priority"/>
        <input id="search-text" name="@search_text" size="10"/>
-       <input type="submit" id="submit" name="submit" value="Search" i18n:attributes="value"/>
+       <input type="submit" id="submit" name="submit" value="Search" i18n:attributes="value" tal:attributes="value request/search_text" />
      </form>
   </div>
  </td>
@@ -70,6 +70,7 @@ <h2><span metal:define-slot="body_title">body title</span></h2>
       '@group': 'priority',
       '@filter': 'status,assignedto',
       '@columns': columns,
+      '@search_text': '',
       'status': status_notresolved,
       'assignedto': '-1',
       '@dispname': i18n.gettext('Show Unassigned'),
@@ -81,6 +82,7 @@ <h2><span metal:define-slot="body_title">body title</span></h2>
       '@group': 'priority',
       '@filter': 'status',
       '@columns': columns_showall,
+      '@search_text': '',
       'status': status_notresolved,
       '@dispname': i18n.gettext('Show All'),
      })"
@@ -141,7 +143,18 @@ <h2><span metal:define-slot="body_title">body title</span></h2>
   <p class="userblock" tal:condition="python:request.user.username != 'anonymous'">
    <b i18n:translate="">Hello, <span i18n:name="user"
     tal:replace="request/user/username">username</span></b><br>
-   <a href="#" tal:attributes="href string:issue?@sort=-activity&@group=priority&@filter=status,assignedto&@columns=id,activity,title,creator,status&status=-1,1,2,3,4,5,6,7&assignedto=${request/user/id}" i18n:translate="">Your Issues</a><br>
+    <a href="#"
+       tal:attributes="href python:request.indexargs_url('issue', {
+      '@sort': '-activity',
+      '@group': 'priority',
+      '@filter': 'status,assignedto',
+      '@columns': 'id,activity,title,creator,status',
+      '@search_text': '',
+      'status': status_notresolved,
+      'assignedto': request.user.id,
+      '@dispname': i18n.gettext('Your Issues'),
+     })"
+    i18n:translate="">Your Issues</a><br>
    <a href="#" tal:attributes="href string:user${request/user/id}"
     i18n:translate="">Your Details</a><br>
    <a href="#" tal:attributes="href python:request.indexargs_url('',

templates/minimal/html/page.html

@@ -39,7 +39,7 @@ <h2><span metal:define-slot="body_title">body title</span></h2>
        <input type="hidden" name="@sort" value="activity"/>
        <input type="hidden" name="@group" value="priority"/>
        <input id="search-text" name="@search_text" size="10"/>
-       <input type="submit" id="submit" name="submit" value="Search" i18n:attributes="value"/>
+       <input type="submit" id="submit" name="submit" value="Search" i18n:attributes="value" tal:attributes="value request/search_text" />
      </form>
   </div>
  </td>
@@ -70,6 +70,7 @@ <h2><span metal:define-slot="body_title">body title</span></h2>
       '@group': 'priority',
       '@filter': 'status,assignedto',
       '@columns': columns,
+      '@search_text': '',
       'status': status_notresolved,
       'assignedto': '-1',
       '@dispname': i18n.gettext('Show Unassigned'),
@@ -81,6 +82,7 @@ <h2><span metal:define-slot="body_title">body title</span></h2>
       '@group': 'priority',
       '@filter': 'status',
       '@columns': columns_showall,
+      '@search_text': '',
       'status': status_notresolved,
       '@dispname': i18n.gettext('Show All'),
      })"
@@ -141,7 +143,6 @@ <h2><span metal:define-slot="body_title">body title</span></h2>
   <p class="userblock" tal:condition="python:request.user.username != 'anonymous'">
    <b i18n:translate="">Hello, <span i18n:name="user"
     tal:replace="request/user/username">username</span></b><br>
-   <a href="#" tal:attributes="href string:issue?@sort=-activity&@group=priority&@filter=status,assignedto&@columns=id,activity,title,creator,status&status=-1,1,2,3,4,5,6,7&assignedto=${request/user/id}" i18n:translate="">Your Issues</a><br>
    <a href="#" tal:attributes="href string:user${request/user/id}"
     i18n:translate="">Your Details</a><br>
    <a href="#" tal:attributes="href python:request.indexargs_url('',