diff roundup/cgi/actions.py @ 6325:1a15089c2e49 issue2550923_computed_property

Merge trunk into branch
author John Rouillard <rouilj@ieee.org>
date Sat, 06 Feb 2021 20:15:26 -0500
parents 45ba6b71f1cf
children c4371ec7d1c0
line wrap: on
line diff
--- a/roundup/cgi/actions.py	Fri Jan 15 16:34:30 2021 -0500
+++ b/roundup/cgi/actions.py	Sat Feb 06 20:15:26 2021 -0500
@@ -809,10 +809,12 @@
             return []
 
     def handleCollision(self, props):
-        message = self._('Edit Error: someone else has edited this %s (%s). '
-            'View <a target="_blank" href="%s%s">their changes</a> '
-            'in a new window.') % (self.classname, ', '.join(props),
-                                   self.classname, self.nodeid)
+        message = self._(
+            'Edit Error: someone else has edited this %(klass)s (%(props)s). '
+            'View <a target="_blank" href="%(klass)s%(id)s">their changes</a> '
+            'in a new window.') % { "klass": self.classname,
+                                    "props": ', '.join(props),
+                                    "id": self.nodeid}
         self.client.add_error_message(message, escape=False)
         return
 

Roundup Issue Tracker: http://roundup-tracker.org/