view.py
branchstable
changeset 2203 efdd3a9f9028
parent 1999 b9a8f5995658
child 2207 5fad58e603f4
--- a/view.py	Tue Jun 30 08:05:57 2009 +0200
+++ b/view.py	Tue Jun 30 15:18:07 2009 +0200
@@ -369,20 +369,20 @@
 
     category = 'anyrsetview'
 
-    def columns_labels(self, tr=True):
+    def columns_labels(self, mainindex=0, tr=True):
         if tr:
             translate = display_name
         else:
             translate = lambda req, val: val
-        rqlstdescr = self.rset.syntax_tree().get_description()[0] # XXX missing Union support
+        # XXX [0] because of missing Union support
+        rqlstdescr = self.rset.syntax_tree().get_description(mainindex,
+                                                             translate)[0]
         labels = []
-        for colindex, attr in enumerate(rqlstdescr):
+        for colindex, label in enumerate(rqlstdescr):
             # compute column header
-            if colindex == 0 or attr == 'Any': # find a better label
+            if label == 'Any': # find a better label
                 label = ','.join(translate(self.req, et)
                                  for et in self.rset.column_types(colindex))
-            else:
-                label = translate(self.req, attr)
             labels.append(label)
         return labels