equal
deleted
inserted
replaced
190 for colindex, label in enumerate(computed_labels): |
190 for colindex, label in enumerate(computed_labels): |
191 if colindex not in displaycols: |
191 if colindex not in displaycols: |
192 continue |
192 continue |
193 # compute column header |
193 # compute column header |
194 if headers is not None: |
194 if headers is not None: |
195 label = headers[displaycols.index(colindex)] |
195 _label = headers[displaycols.index(colindex)] |
|
196 if _label is not None: |
|
197 label = _label |
196 if colindex == mainindex and label is not None: |
198 if colindex == mainindex and label is not None: |
197 label += ' (%s)' % self.cw_rset.rowcount |
199 label += ' (%s)' % self.cw_rset.rowcount |
198 column = TableColumn(label, colindex) |
200 column = TableColumn(label, colindex) |
199 coltype = self.cw_rset.description[0][colindex] |
201 coltype = self.cw_rset.description[0][colindex] |
200 # compute column cell view (if coltype is None, it's a left outer |
202 # compute column cell view (if coltype is None, it's a left outer |