diff options
| author | Vidhin Mehta (OpenERP) <vme@tinyerp.com> | 2011-11-11 11:07:03 +0530 |
|---|---|---|
| committer | Vidhin Mehta (OpenERP) <vme@tinyerp.com> | 2011-11-11 11:07:03 +0530 |
| commit | 6bf24d1890eefcf168fdd4959565a3756ec0950e (patch) | |
| tree | 0f559c2573d26b372a99dddf9137fea9bf16da00 /addons/web/static/src/xml/base.xml | |
| parent | d5c21085f91cb2e360e6f769e66b9add05206d57 (diff) | |
| parent | 453f747b1dda7ddcd9a2f2f3a627af3a12a33247 (diff) | |
[MERGE]merge with main branch.
bzr revid: vme@tinyerp.com-20111111053703-r8gx2w67t0w38jp7
Diffstat (limited to 'addons/web/static/src/xml/base.xml')
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index f5448168f5e..d8eb6a3f8f4 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -623,18 +623,9 @@ </td> </t> - <t t-if="options.radio"> - <th t-if="options.selectable" class="oe-record-selector" width="1"> - <input type="radio" name ="radiogroup"/> - </th> - </t> - <t t-if="!options.radio"> - <th t-if="options.selectable" class="oe-record-selector" width="1"> - <input type="checkbox"/> - </th> - </t> - - + <th t-if="options.selectable" class="oe-record-selector" width="1"> + <input t-att-type="options.radio? 'radio': 'checkbox'" name ="radiogroup" t-att-checked="options.select_view_id == record.get('id')? true: null"/> + </th> <t t-foreach="columns" t-as="column"> <t t-set="align" t-value="column.type === 'integer' or column.type == 'float'"/> <td t-if="!column.meta and column.invisible !== '1'" t-att-title="column.help" @@ -1326,7 +1317,7 @@ </t> <t t-name="vieweditor_selection"> <select t-att-id="widget.name" > - <t t-foreach="widget.value" t-as="option"> + <t t-if="widget.selection" t-foreach="widget.selection" t-as="option"> <option t-att-value="typeof option === 'object' ? option[0] : option"> <t t-esc="typeof option === 'object' ? option[1] : option"/> |