appy.gen: bugfixes in the List field.

This commit is contained in:
Gaetan Delannay 2012-03-01 17:35:23 +01:00
parent 6d0549e6ce
commit 7d605d1fbb
8 changed files with 107 additions and 47 deletions

View file

@ -121,7 +121,7 @@ class ToolMixin(BaseMixin):
p_code.'''
return languages.get(code)[2]
def getCssJs(self):
def getGlobalCssJs(self):
'''Returns the list of CSS and JS files to include in the main template.
The method ensures that appy.css and appy.js come first.'''
names = self.getPhysicalRoot().ui.objectIds('File')

View file

@ -562,7 +562,10 @@ class BaseMixin:
field is supposed to belong to self's class.'''
isInnerType = '*' in name # An inner type lies within a List type.
subName = None
if isInnerType: name, subName, i = name.split('*')
if isInnerType:
elems = name.split('*')
if len(elems) == 2: name, subName = elems
else: name, subName, i = elems
if not className:
klass = self.__class__.wrapperClass
else:
@ -614,10 +617,10 @@ class BaseMixin:
res.append(appyType)
return res
def getCssAndJs(self, fields, layoutType):
def getCssJs(self, fields, layoutType):
'''Gets the list of Javascript and CSS files required by Appy types
p_fields when shown on p_layoutType.'''
# lists css and js below are not sets, because order of Javascript
# Lists css and js below are not sets, because order of Javascript
# inclusion can be important, and this could be losed by using sets.
css = []
js = []