From 99a89b6f0ddc547b2ddc135a5898cc3886b5392c Mon Sep 17 00:00:00 2001 From: Helmut Merz Date: Mon, 19 Mar 2012 19:07:00 +0100 Subject: [PATCH] provide appropriate default definitions for select and sort values --- composer/report/field.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/composer/report/field.py b/composer/report/field.py index 84c6091..79e3903 100644 --- a/composer/report/field.py +++ b/composer/report/field.py @@ -71,8 +71,9 @@ class Field(Component): return row.getRawValue(self.name) def getSelectValue(self, row): - return getattr(row, self.name, None) - #return self.getRawValue(row) # better let row control selection... + return self.getValue(row) + #return self.getRawValue(row) + #return getattr(row, self.name, None) def getValue(self, row): value = self.getRawValue(row) @@ -86,9 +87,9 @@ class Field(Component): return self.getValue(row) def getSortValue(self, row): - # TODO: consider 'descending' flag, use raw value instead of formatted one - return getattr(row, self.name, None) - #return self.getValue(row) + # TODO: consider 'descending' flag (?use raw value instead of formatted one?) + return self.getValue(row) + #return getattr(row, self.name, None) class CalculatedField(Field):