diff options
| author | Xavier Morel <xmo@openerp.com> | 2011-05-24 16:00:55 +0200 |
|---|---|---|
| committer | Xavier Morel <xmo@openerp.com> | 2011-05-24 16:00:55 +0200 |
| commit | bf57c5ab9050bc18a1e973c623e5c756750b2926 (patch) | |
| tree | 57634a7f614fb910c368566927bbdcb9ff007e37 /addons/base/static/src/xml/base.xml | |
| parent | f1694ed583c88ff7754e802e645c8a9b9be02548 (diff) | |
| parent | 7e7034436c8fa041953ccee5d0efe690c2d6ce16 (diff) | |
[IMP] a bunch of improvements to groups handling in list view
* Support for aggregate fields in groups
* Complete (breaking) change to DataGroup API, turns out the old one sucked
* Correctly display groups (and nested data columns)
* Support for group_by_no_leaf, with and without group_by fields
bzr revid: xmo@openerp.com-20110524140055-6g22b1xt7hz9ujrl
Diffstat (limited to 'addons/base/static/src/xml/base.xml')
| -rw-r--r-- | addons/base/static/src/xml/base.xml | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml index dc808872e3a..70016538b10 100644 --- a/addons/base/static/src/xml/base.xml +++ b/addons/base/static/src/xml/base.xml @@ -187,9 +187,14 @@ </th> </tr> <tr t-if="options.header"> + <t t-foreach="columns" t-as="column"> + <th t-if="column.meta"> + <t t-esc="column.string"/> + </th> + </t> <th t-if="options.selectable"/> <t t-foreach="columns" t-as="column"> - <th t-if="column.invisible !== '1'" t-att-data-id="column.id" + <th t-if="!column.meta and column.invisible !== '1'" t-att-data-id="column.id" t-att-class="((options.sortable and column.tag !== 'button') ? 'oe-sortable' : null)"> <t t-if="column.tag !== 'button'"> <t t-esc="column.string"/> @@ -210,17 +215,22 @@ </t> </t> <tr t-name="ListView.row" t-att-style="style" t-att-class="row_parity"> + <t t-foreach="columns" t-as="column"> + <td t-if="column.meta"> + + </td> + </t> <th t-if="options.selectable" class="oe-record-selector"> <input type="checkbox"/> </th> <t t-foreach="columns" t-as="column"> - <t t-set="attrs" t-value="column.attrs_for(row.data)"/> - <td t-if="column.invisible !== '1'" t-att-title="column.help" + <td t-if="!column.meta and column.invisible !== '1'" t-att-title="column.help" class="oe-field-cell" t-att-data-field="column.id"> + <t t-set="attrs" t-value="column.attrs_for(row.data)"/> <t t-if="!attrs.invisible"> <t t-set="is_button" t-value="column.tag === 'button'"/> <!-- TODO: get correct widget from form --> - <t t-if="!is_button and row['data'][column.id].value"> + <t t-if="!is_button and row['data'][column.id].value !== false"> <t t-set="value" t-value="row['data'][column.id].value"/> <t t-esc="value instanceof Array ? value[1] : value"/> </t> |