diff -r 84a5106840fa -r c8a6edc224bb common/view.py --- a/common/view.py Thu Jan 08 12:12:40 2009 +0100 +++ b/common/view.py Thu Jan 08 12:39:46 2009 +0100 @@ -383,6 +383,27 @@ __selectors__ = (nonempty_rset,) category = 'anyrsetview' + + def display_value(self, etype, val): + if val is not None and not self.schema.eschema(etype).is_final(): + # csvrow.append(val) # val is eid in that case + return self.view('textincontext', self.rset, + row=rowindex, col=colindex) + return self.view('final', self.rset, displaytime=True, + row=rowindex, col=colindex) + + def columns_labels(self): + rqlstdescr = self.rset.syntax_tree().get_description()[0] # XXX missing Union support + labels = [] + for colindex, attr in enumerate(rqlstdescr): + # compute column header + if colindex == 0 or attr == 'Any': # find a better label + label = ','.join(display_name(self.req, et) + for et in self.rset.column_types(colindex)) + else: + label = display_name(self.req, attr) + labels.append(label) + return labels class EmptyRsetView(View):