Mercurial > p > roundup > code
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 6319:20e77c3ce6f6 | 6325:1a15089c2e49 |
|---|---|
| 807 return list(props[key]) | 807 return list(props[key]) |
| 808 else: | 808 else: |
| 809 return [] | 809 return [] |
| 810 | 810 |
| 811 def handleCollision(self, props): | 811 def handleCollision(self, props): |
| 812 message = self._('Edit Error: someone else has edited this %s (%s). ' | 812 message = self._( |
| 813 'View <a target="_blank" href="%s%s">their changes</a> ' | 813 'Edit Error: someone else has edited this %(klass)s (%(props)s). ' |
| 814 'in a new window.') % (self.classname, ', '.join(props), | 814 'View <a target="_blank" href="%(klass)s%(id)s">their changes</a> ' |
| 815 self.classname, self.nodeid) | 815 'in a new window.') % { "klass": self.classname, |
| 816 "props": ', '.join(props), | |
| 817 "id": self.nodeid} | |
| 816 self.client.add_error_message(message, escape=False) | 818 self.client.add_error_message(message, escape=False) |
| 817 return | 819 return |
| 818 | 820 |
| 819 def handle(self): | 821 def handle(self): |
| 820 """Perform an edit of an item in the database. | 822 """Perform an edit of an item in the database. |