rattail/appypod-rattail
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

[gen] string.py: bugfixes: show differences in multilingual fields.

Browse source
This commit is contained in:
Gaetan Delannay 2014-11-17 11:44:00 +01:00
parent 0465fae6dc
commit e6adfe39d4
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
fields/string.py
View file

@ -596,6 +596,9 @@ class String(Field):
comparator = HtmlDiff(res, thisVersion, iMsg, dMsg) comparator = HtmlDiff(res, thisVersion, iMsg, dMsg)
res = comparator.get() res = comparator.get()
lastEvent = event lastEvent = event
if not lastEvent:
# There is no diff to show for this p_language.
return value
# Now we need to compare the result with the current version. # Now we need to compare the result with the current version.
iMsg, dMsg = obj.getHistoryTexts(lastEvent) iMsg, dMsg = obj.getHistoryTexts(lastEvent)
comparator = HtmlDiff(res, value or '', iMsg, dMsg) comparator = HtmlDiff(res, value or '', iMsg, dMsg)
@ -607,7 +610,7 @@ class String(Field):
m_getFormattedValue for getting a non-multilingual value (ie, in m_getFormattedValue for getting a non-multilingual value (ie, in
most cases). Else, this method returns a formatted value for the most cases). Else, this method returns a formatted value for the
p_language-specific part of a multilingual value.''' p_language-specific part of a multilingual value.'''
if Field.isEmptyValue(self, obj, value): return '' if Field.isEmptyValue(self, obj, value) and not showChanges: return ''
res = value res = value
if self.isSelect: if self.isSelect:
if isinstance(self.validator, Selection): if isinstance(self.validator, Selection):
@ -647,11 +650,13 @@ class String(Field):
userLanguage=language) userLanguage=language)
# Return the dict of values whose individual, language-specific values # Return the dict of values whose individual, language-specific values
# have been formatted via m_getUnilingualFormattedValue. # have been formatted via m_getUnilingualFormattedValue.
if not value: return value if not value and not showChanges: return value
res = {} res = {}
for lg in languages: for lg in languages:
res[lg] = self.getUnilingualFormattedValue(obj, value[lg], if not value: val = ''
showChanges, language=lg) else: val = value[lg]
res[lg] = self.getUnilingualFormattedValue(obj, val, showChanges,
language=lg)
return res return res
def getShownValue(self, obj, value, showChanges=False, language=None): def getShownValue(self, obj, value, showChanges=False, language=None):