fix "clear this message" [SF#1429367]

Author: Richard Jones

CHANGES.txt

@@ -21,6 +21,7 @@ Fixed:
 - fix "Adding a new constrained field to the classic schema" example in docs
   (sf bug 1433118)
 - fix security check in mailgw (sf bug 1442145)
+- fix "clear this message" (sf bug 1429367)
 
 
 2006-02-10 1.1.0

roundup/cgi/templating.py

@@ -2064,6 +2064,7 @@ def __init__(self, client):
 
         # store the current class name and action
         self.classname = client.classname
+        self.nodeid = client.nodeid
         self.template = client.template
 
         # the special char to use for special vars
@@ -2073,6 +2074,17 @@ def __init__(self, client):
 
         self._post_init()
 
+    def current_url(self):
+        url = self.base
+        if self.classname:
+            url += self.classname
+            if self.nodeid:
+                url += self.nodeid
+        args = {}
+        if self.template:
+            args['@template'] = self.template
+        return self.indexargs_url(url, args)
+
     def _post_init(self):
         ''' Set attributes based on self.form
         '''

templates/classic/html/page.html

@@ -133,7 +133,7 @@ <h2><span metal:define-slot="body_title">body title</span></h2>
   <p tal:condition="options/ok_message | nothing" class="ok-message">
     <span tal:repeat="m options/ok_message"
        tal:content="structure string:$m <br/ > " />
-     <a class="form-small" tal:attributes="href string:issue${context/id}"
+     <a class="form-small" tal:attributes="href request/current_url"
         i18n:translate="">clear this message</a>
   </p>
  </td>
@@ -229,3 +229,4 @@ <h2><span metal:define-slot="body_title">body title</span></h2>
          tal:attributes="value name;
                          checked python:name == group_on">
 </td>
+

templates/minimal/html/page.html

@@ -78,7 +78,7 @@ <h2><span metal:define-slot="body_title">body title</span></h2>
   <p tal:condition="options/ok_message | nothing" class="ok-message">
     <span tal:repeat="m options/ok_message"
        tal:content="structure string:$m <br/ > " />
-     <a class="form-small" tal:attributes="href string:issue${context/id}"
+     <a class="form-small" tal:attributes="href request/current_url"
         i18n:translate="">clear this message</a>
   </p>
  </td>