[gen] Bigfixees in cleaning of XHTML fields.
This commit is contained in:
parent
f4e40caf5c
commit
90e46f11e7
4 changed files with 17 additions and 7 deletions
|
@ -1067,6 +1067,12 @@ class ToolMixin(BaseMixin):
|
|||
names are normalized.'''
|
||||
tool = self.appy()
|
||||
if not login: login = tool.user.getId()
|
||||
# Manage the special case of an anonymous user.
|
||||
if login == 'Anonymous User':
|
||||
name = self.translate('anonymous')
|
||||
if normalized: name = normalizeString(name)
|
||||
return name
|
||||
# Manage the case of a "real" user.
|
||||
user = tool.search1('User', noSecurity=True, login=login)
|
||||
if not user: return login
|
||||
firstName = user.firstName
|
||||
|
|
|
@ -29,7 +29,7 @@ appyLabels = [
|
|||
('appy_title', 'Title'),
|
||||
('data_change', 'Data change'),
|
||||
('modified_field', 'Modified field'),
|
||||
('previous_value', 'Previous value'),
|
||||
('previous_value', 'Previous value or modification'),
|
||||
('phase', 'phase'),
|
||||
('choose_a_value', ' - '),
|
||||
('choose_a_doc', '[ Documents ]'),
|
||||
|
@ -200,6 +200,7 @@ appyLabels = [
|
|||
('history_delete', 'Deleted by ${userName}'),
|
||||
('changes_show', 'Show changes'),
|
||||
('changes_hide', 'Hide changes'),
|
||||
('anonymous', 'an anonymous user'),
|
||||
]
|
||||
|
||||
# Some default values for labels whose ids are not fixed (so they can't be
|
||||
|
|
|
@ -190,7 +190,7 @@
|
|||
</tal:accessHistory>
|
||||
|
||||
<tal:comment replace="nothing">Document creator</tal:comment>
|
||||
<tal:creator condition="python: creator != 'Anonymous User'">
|
||||
<tal:creator>
|
||||
<tal:by replace="python: _('object_created_by')"/>
|
||||
<tal:creator replace="python: tool.getUserName(creator)"/>
|
||||
</tal:creator>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue