Added method 'unlink' on any appy class, for unlinking objects from references. Bugfixes in display of workflow state in columns.
This commit is contained in:
parent
defdc08dce
commit
38f71be89a
4 changed files with 34 additions and 9 deletions
|
@ -482,7 +482,7 @@ class ToolMixin(BaseMixin):
|
|||
(p_usage can be "ref" or "search")?'''
|
||||
if (',' in className) or (name == 'workflowState'): return False
|
||||
appyType = self.getAppyType(name, className=className)
|
||||
return appyType.isSortable(usage=usage)
|
||||
if appyType: return appyType.isSortable(usage=usage)
|
||||
|
||||
def _searchValueIsEmpty(self, key):
|
||||
'''Returns True if request value in key p_key can be considered as
|
||||
|
|
|
@ -509,7 +509,7 @@ class BaseMixin:
|
|||
for name in fieldNames:
|
||||
appyType = self.getAppyType(name, asDict)
|
||||
if appyType: res.append(appyType)
|
||||
elif name == 'workflowState':
|
||||
elif name == 'state':
|
||||
# We do not return a appyType if the attribute is not a *real*
|
||||
# attribute, but the workfow state.
|
||||
res.append({'name': name, 'labelId': 'workflow_state',
|
||||
|
@ -1044,7 +1044,7 @@ class BaseMixin:
|
|||
params = ''
|
||||
return '%s%s' % (base, params)
|
||||
|
||||
def getLanguage(self):
|
||||
def getUserLanguage(self):
|
||||
'''Gets the language (code) of the current user.'''
|
||||
# Try first the "LANGUAGE" key from the request
|
||||
res = self.REQUEST.get('LANGUAGE', None)
|
||||
|
@ -1076,7 +1076,7 @@ class BaseMixin:
|
|||
else:
|
||||
# We will get the translation from a Translation object.
|
||||
# In what language must we get the translation?
|
||||
if not language: language = self.getLanguage()
|
||||
if not language: language = self.getUserLanguage()
|
||||
tool = self.getTool()
|
||||
try:
|
||||
translation = getattr(tool, language).appy()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue