- issue2550964 - History can (temporarily) show incorrect value...

when a change is rejected.

Fix history function to always use the database values and ignore the
current setting in the form.

Author: rouilj

CHANGES.txt

@@ -119,6 +119,9 @@ Fixed:
 - issue2551122 - sorted method of MultilinkHTMLProperty does a string
   sort even if the property is an integer. Fixed so that the orderprop
   for the linked class is used. (John Rouillard, reported by Nagy Gabor)
+- issue2550964 - History can (temporarily) show incorrect value when a
+  change is rejected. Fix history function to always use the database
+  values and ignore the current setting in the form.
 
 Features:
 - issue2550522 - Add 'filter' command to command-line

roundup/cgi/templating.py

@@ -1133,6 +1133,12 @@ def history(self, direction='descending', dre=re.compile(r'^\d+$'),
         if not self.is_view_ok():
             return self._('[hidden]')
 
+        # history should only use database values not current
+        # form values. Disable form_wins for the body of the
+        # function. Reset it to original value on return.
+        orig_form_wins = self._client.form_wins
+        self._client.form_wins = False
+                
         # get the journal, sort and reverse
         history = self._klass.history(self._nodeid, skipquiet=(not showall))
         history.sort(key=lambda a: a[:3])
@@ -1375,6 +1381,9 @@ def history(self, direction='descending', dre=re.compile(r'^\d+$'),
              self._('<th>Args</th>'),
             '</tr>']
         l.append('</table>')
+
+        self._client.form_wins = orig_form_wins
+        
         return '\n'.join(l)
 
     def renderQueryForm(self):