diff options
| author | Jiten (OpenERP) <jra@tinyerp.com> | 2012-10-19 11:18:45 +0530 |
|---|---|---|
| committer | Jiten (OpenERP) <jra@tinyerp.com> | 2012-10-19 11:18:45 +0530 |
| commit | ee40868da97fe5606592f00cc07c5d1a06c5de10 (patch) | |
| tree | 4da679fcf66b62ad030a2035edb11020bdb3a86e /addons/web/static/src/xml/base.xml | |
| parent | 399e13ec854189e87e5f0585565bb22de9b9f626 (diff) | |
| parent | 4755454c2a7cbb37aab3ca29978fa7ac561ec9f6 (diff) | |
[MERGE] Merged trunk.
bzr revid: jra@tinyerp.com-20121016054400-14aecskaihyisudd
bzr revid: jra@tinyerp.com-20121017104013-izsyo7vmhr34j6ta
bzr revid: jra@tinyerp.com-20121018060329-7ww5t46blyw2a60q
bzr revid: jra@tinyerp.com-20121019054845-47naqth4kfe6xczv
Diffstat (limited to 'addons/web/static/src/xml/base.xml')
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index a09897862f6..06603ad17a5 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -630,10 +630,10 @@ <input type="checkbox" class="oe_list_record_selector"/> </th> <t t-foreach="columns" t-as="column"> - <th t-if="!column.meta and column.invisible !== '1' and !column.reorderable" t-att-data-id="column.id" - t-attf-class="oe_list_header_#{column.widget or column.type} #{((options.sortable and column.tag !== 'button') ? 'oe_sortable' : null)}"> + <th t-if="!column.meta and column.invisible !== '1'" t-att-data-id="column.id" + t-attf-class="oe_list_header_#{column.widget or column.type} #{((options.sortable and column.tag !== 'button') ? 'oe_sortable' : null)}"><div> <t t-if="column.tag !== 'button'"><t t-esc="column.string"/></t> - </th> + </div></th> </t> <th t-if="options.deletable" class="oe_list_record_delete" width="13px"/> </tr> @@ -683,7 +683,7 @@ <t t-foreach="columns" t-as="column"> <t t-set="number" t-value="column.type === 'integer' or column.type == 'float'"/> <t t-set="modifiers" t-value="column.modifiers_for(asData)"/> - <td t-if="!column.meta and column.invisible !== '1' and !column.reorderable" t-att-title="column.help" + <td t-if="!column.meta and column.invisible !== '1'" t-att-title="column.help" t-attf-class="oe_list_field_cell oe_list_field_#{column.widget or column.type} #{number ? 'oe_number' : ''} #{column.tag === 'button' ? 'oe-button' : ''} #{modifiers.readonly ? 'oe_readonly' : ''} #{modifiers.required ? 'oe_required' : ''}" t-att-data-field="column.id" ><t t-raw="render_cell(record, column)"/></td> @@ -1078,7 +1078,7 @@ </t> <t t-name="FieldStatus.content"> <t t-foreach="widget.selection" t-as="i"> - <li t-att-class="i[0] === widget.selected_value ? 'oe_active' : ''" t-att-data-id="i[0]"> + <li t-att-class="i[0] === widget.get('value') ? 'oe_active' : ''" t-att-data-id="i[0]"> <span class="label"><t t-esc="i[1]"/></span> <!-- are you mit ? --> <span class="arrow"><span></span></span> |