diff options
| author | Kunal Chavda (OpenERP) <kch@tinyerp.com> | 2011-09-08 16:09:19 +0530 |
|---|---|---|
| committer | Kunal Chavda (OpenERP) <kch@tinyerp.com> | 2011-09-08 16:09:19 +0530 |
| commit | a8467f7b3c4a63d6253dcd259b97c89aab4533f6 (patch) | |
| tree | 26190a9e7f2c965f9c30220f642ba2ffc3ceb7ca /addons/web/static/src/xml/base.xml | |
| parent | 783904920a5804b61af90f335d1a1a3963e1ff70 (diff) | |
| parent | bba27daf04ff27b1f3c71e0dee7c73375efc11a4 (diff) | |
[MERGE]Merge with trunk upto revision no 970.
bzr revid: kch@tinyerp.com-20110908103919-0elkj4hdhhgpvx6o
Diffstat (limited to 'addons/web/static/src/xml/base.xml')
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 594bffbb64d..a523b49a863 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -799,10 +799,8 @@ t-att-id="widget.element_id + '_field'" t-att-class="'field_' + widget.type" style="width: 100%"> - <t t-foreach="widget.field_index" t-as="options"> - <option t-att-value="options.ikey"> - <t t-esc="options.label"/> - </option> + <t t-foreach="widget.values" t-as="option"> + <option><t t-esc="option[1]"/></option> </t> </select> </t> @@ -1113,7 +1111,8 @@ <div t-att-id="element_id"> <select class="searchview_extended_prop_field"> <t t-foreach="attrs.fields" t-as="field"> - <option t-att="{'selected': field === attrs.selected ? 'selected' : null}" + <option t-if="typeof field.store === 'undefined' || field.store || field.fnct_search" + t-att="{'selected': field === attrs.selected ? 'selected' : null}" t-att-value="field.name"> <t t-esc="field.string"/> </option> |