[gen] Bugfixes.
This commit is contained in:
parent
50bd996c3b
commit
6cd64fdc50
|
@ -575,12 +575,12 @@ class Field:
|
|||
if self.isEmptyValue(obj, value): return ''
|
||||
return value
|
||||
|
||||
def getShownValue(self, obj, value, showChanges=False):
|
||||
def getShownValue(self, obj, value, showChanges=False, language=None):
|
||||
'''Similar to m_getFormattedValue, but in some contexts, only a part of
|
||||
p_value must be shown. For example, sometimes we need to display only
|
||||
a language-specific part of a multilingual field (see overridden
|
||||
method in string.py).'''
|
||||
return self.getFormattedValue(obj, value, showChanges)
|
||||
return self.getFormattedValue(obj, value, showChanges, language)
|
||||
|
||||
def getXmlValue(self, obj, value):
|
||||
'''This method allows a developer to customize the value that will be
|
||||
|
|
|
@ -29,7 +29,7 @@ class Action(Field):
|
|||
pxView = pxCell = Px('''
|
||||
<form var="formId='%s_%s_form' % (zobj.id, name);
|
||||
label=_(field.labelId);
|
||||
descr=field.descrId and _(field.descrId) or None;
|
||||
descr=field.hasDescr and _(field.descrId) or None;
|
||||
buttonWidth=ztool.getButtonWidth(label)"
|
||||
id=":formId" action=":ztool.absolute_url() + '/do'"
|
||||
style="display:inline">
|
||||
|
|
|
@ -1514,10 +1514,11 @@ class BaseMixin:
|
|||
return False
|
||||
if parent.meta_type not in ('Folder', 'Temporary Folder'): return parent
|
||||
|
||||
def getShownValue(self, name):
|
||||
def getShownValue(self, name='title', language=None):
|
||||
'''Call field.getShownValue on field named p_name.'''
|
||||
field = self.getAppyType('title')
|
||||
return field.getShownValue(self, field.getValue(self))
|
||||
field = self.getAppyType(name)
|
||||
return field.getShownValue(self, field.getValue(self),
|
||||
language=language)
|
||||
|
||||
def getBreadCrumb(self, inPopup=False):
|
||||
'''Gets breadcrumb info about this object and its parents (if it must
|
||||
|
|
|
@ -893,6 +893,9 @@ class AbstractWrapper(object):
|
|||
setattr(appyObj, attrName, attrValue)
|
||||
except AttributeError, ae:
|
||||
if raiseOnWrongAttribute: raise ae
|
||||
# Call custom early initialization
|
||||
if executeMethods and hasattr(appyObj, 'onEditEarly'):
|
||||
appyObj.onEditEarly()
|
||||
if isField:
|
||||
# Link the object to this one
|
||||
field.linkObject(self, appyObj, executeMethods=executeMethods)
|
||||
|
|
Loading…
Reference in a new issue