Several bugfixes for 0.6 series (bugfix while defining pod fields in a custom tool, bugfix in the creation flag, import of objects was broken...) and minor improvements in the layouting system (automatic generation of 'cell' layouts was optimized).
This commit is contained in:
parent
3d87036f85
commit
7dc55f23c2
11 changed files with 230 additions and 207 deletions
|
@ -180,7 +180,8 @@ class ToolMixin(BaseMixin):
|
|||
sortMethod = importParams['sort']
|
||||
if sortMethod: sortMethod = sortMethod.__get__('')
|
||||
elems = []
|
||||
importPath = getattr(self, 'importPathFor%s' % contentType)
|
||||
importType = self.getAppyType('importPathFor%s' % contentType)
|
||||
importPath = importType.getValue(self)
|
||||
for elem in os.listdir(importPath):
|
||||
elemFullPath = os.path.join(importPath, elem)
|
||||
elemInfo = onElement(elemFullPath)
|
||||
|
|
|
@ -919,9 +919,14 @@ class BaseMixin:
|
|||
'''Translates a given p_label into p_domain with p_mapping.'''
|
||||
cfg = self.getProductConfig()
|
||||
if not domain: domain = cfg.PROJECTNAME
|
||||
return self.Control_Panel.TranslationService.utranslate(
|
||||
domain, label, mapping, self, default=default,
|
||||
target_language=language)
|
||||
try:
|
||||
res = self.Control_Panel.TranslationService.utranslate(
|
||||
domain, label, mapping, self, default=default,
|
||||
target_language=language)
|
||||
except AttributeError:
|
||||
# When run in test mode, Zope does not create the TranslationService
|
||||
res = label
|
||||
return res
|
||||
|
||||
def getPageLayout(self, layoutType):
|
||||
'''Returns the layout corresponding to p_layoutType for p_self.'''
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue