[gen] Allow to have data change events that contain comments.
This commit is contained in:
parent
e72f53c0d9
commit
3dfb90b5b3
|
@ -177,8 +177,7 @@ class BaseMixin:
|
||||||
history.append(event)
|
history.append(event)
|
||||||
self.workflow_history['appy'] = tuple(history)
|
self.workflow_history['appy'] = tuple(history)
|
||||||
appy = self.appy()
|
appy = self.appy()
|
||||||
self.log('data change event deleted for %s (UID=%s).' % \
|
self.log('data change event deleted for %s.' % appy.uid)
|
||||||
(appy.klass.__name__, appy.uid))
|
|
||||||
self.goto(self.getUrl(rq['HTTP_REFERER']))
|
self.goto(self.getUrl(rq['HTTP_REFERER']))
|
||||||
|
|
||||||
def onLink(self):
|
def onLink(self):
|
||||||
|
|
|
@ -370,7 +370,7 @@ class AbstractWrapper(object):
|
||||||
<td if="isDataChange">
|
<td if="isDataChange">
|
||||||
<!-- Display the previous values of the fields whose value were
|
<!-- Display the previous values of the fields whose value were
|
||||||
modified in this change. -->
|
modified in this change. -->
|
||||||
<table class="appyChanges" width="100%">
|
<table class="appyChanges" width="100%" if="event['changes']">
|
||||||
<tr>
|
<tr>
|
||||||
<th align=":dleft" width="30%">:_('modified_field')</th>
|
<th align=":dleft" width="30%">:_('modified_field')</th>
|
||||||
<th align=":dleft" width="70%">:_('previous_value')</th>
|
<th align=":dleft" width="70%">:_('previous_value')</th>
|
||||||
|
@ -384,6 +384,8 @@ class AbstractWrapper(object):
|
||||||
<td>::change[1][0]</td>
|
<td>::change[1][0]</td>
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
|
<!-- There may also be a comment, too -->
|
||||||
|
<x if="rhComments">::zobj.formatText(rhComments)</x>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
|
|
Loading…
Reference in a new issue