cco/loops
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

make multiline field tolerate scalar values; header row factory is now special class assigned in base class

Browse source
This commit is contained in:
Helmut Merz 2012-04-11 12:35:49 +02:00
parent 7b1f04e7ab
commit d583f0e980
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
expert/field.py
View file

@ -179,7 +179,10 @@ class MultiLineField(Field):
return self.getRawValue(row) return self.getRawValue(row)
def getDisplayValues(self, row): def getDisplayValues(self, row):
return self.getValue(row) value = self.getValue(row)
if not isinstance(value, (list, tuple)):
value = [value]
return value
# sub-report stuff # sub-report stuff

3
expert/report.py
View file

@ -77,7 +77,7 @@ class ReportInstance(BaseReport):
adapts(IReport) adapts(IReport)
rowFactory = Row rowFactory = Row
headerRowFactory = Row #headerRowFactory = Row
view = None # set upon creation view = None # set upon creation
@ -103,7 +103,6 @@ class ReportInstance(BaseReport):
result = list(self.selectObjects(parts)) # may modify parts result = list(self.selectObjects(parts)) # may modify parts
qc = CompoundQueryCriteria(parts) qc = CompoundQueryCriteria(parts)
return ResultSet(self, result, rowFactory=self.rowFactory, return ResultSet(self, result, rowFactory=self.rowFactory,
headerRowFactory=self.headerRowFactory,
sortCriteria=self.getSortCriteria(), queryCriteria=qc) sortCriteria=self.getSortCriteria(), queryCriteria=qc)
def selectObjects(self, parts): def selectObjects(self, parts):
# to be implemented by subclass # to be implemented by subclass