diff options
| author | Olivier Dony <odo@openerp.com> | 2013-04-30 12:33:37 +0200 |
|---|---|---|
| committer | Olivier Dony <odo@openerp.com> | 2013-04-30 12:33:37 +0200 |
| commit | ba5710962edf94291f938cb1b3ccda08503c64b9 (patch) | |
| tree | d633d9a7e53a967588392eb9f74b6a5691088442 /addons/web/static/src/xml | |
| parent | 9c08e129625b0ccd3c795b95735dcdd9f15db2ac (diff) | |
| parent | 7c160b8a72601279a1d8a2e005f6d743f6975a50 (diff) | |
[MERGE] Forward-port of 7.0 bugfixes, up to rev. 3912
revision-id: nicolas.vanhoren@openerp.com-20130430094843-9m1629m517vjtm1o
bzr revid: xmo@openerp.com-20130424102025-w33zyopm96r7q09p
bzr revid: odo@openerp.com-20130430103337-i9wuj8zf3h41h1ay
Diffstat (limited to 'addons/web/static/src/xml')
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 943326f5011..c27e16cbb79 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -650,7 +650,7 @@ <li t-if="section.name == 'files'" class="oe_sidebar_add_attachment"> <t t-call="HiddenInputFile"> <t t-set="fileupload_id" t-value="widget.fileupload_id"/> - <t t-set="fileupload_action">/web/binary/upload_attachment</t> + <t t-set="fileupload_action" t-translation="off">/web/binary/upload_attachment</t> <input type="hidden" name="model" t-att-value="widget.dataset and widget.dataset.model"/> <input type="hidden" name="id" t-att-value="widget.model_id"/> <input type="hidden" name="session_id" t-att-value="widget.session.session_id"/> @@ -1552,8 +1552,9 @@ <t t-esc="attrs.string"/> </button> <ul t-name="SearchView.filters"> - <li t-foreach="widget.filters" t-as="filter" t-if="filter.visible()" - t-att-title="filter.attrs.string ? filter.attrs.help : undefined"> + <li t-foreach="widget.filters" t-as="filter" t-if="!filter.visible || filter.visible()" + t-att-title="filter.attrs.string ? filter.attrs.help : undefined" + t-att-data-index="filter_index"> <t t-esc="filter.attrs.string or filter.attrs.help or filter.attrs.name or 'Ω'"/> </li> </ul> |