diff options
| author | Christophe Matthieu <chm@openerp.com> | 2013-04-30 10:34:44 +0200 |
|---|---|---|
| committer | Christophe Matthieu <chm@openerp.com> | 2013-04-30 10:34:44 +0200 |
| commit | d47824c79291b4904c5b3087b7bdf16fd84c0a50 (patch) | |
| tree | ec141eb2df81e07e89e0f5985c1aaf83eea97088 /addons/web/static/src/xml/base.xml | |
| parent | b8a5ec1dc9cfbac79fd8a540c01a7c0749c522f9 (diff) | |
| parent | 511efd43a90b6bbc30bac9764358fc81b42fb13a (diff) | |
[MERGE] from trunk
bzr revid: chm@openerp.com-20130430083444-r300f3a2s5kgbj9k
Diffstat (limited to 'addons/web/static/src/xml/base.xml')
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 41 |
1 files changed, 35 insertions, 6 deletions
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 65d70b64666..14c7f722ec2 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -40,11 +40,11 @@ <td> <p> <t t-js="d"> - var message = d.error.data.message || d.error.data.fault_code; - d.error.html_error = context.engine.tools.html_escape(message) + var message = d.message ? d.message : d.error.data.message; + d.html_error = context.engine.tools.html_escape(message) .replace(/\n/g, '<br/>'); </t> - <t t-raw="error.html_error"/> + <t t-raw="html_error"/> </p> </td> </tr> @@ -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"/> @@ -1111,6 +1111,34 @@ </select> </span> </t> +<t t-name="FieldRadio"> + <span t-attf-class="oe_form_field oe_form_field_radio #{widget.options.horizontal ? 'oe_horizontal' : 'oe_vertical'}" t-att-style="widget.node.attrs.style"> + <span t-if="!widget.get('effective_readonly')"> + <t t-if="widget.options.horizontal"> + <t t-set="width" t-value="Math.floor(100 / widget.selection.length)"/> + <t t-if="!widget.options.no_radiolabel"> + <t t-foreach="widget.selection" t-as="selection"> + <label t-att-for="widget.uniqueId + '_' + selection[0]" t-att-style="'width: ' + width + '%;'"><t t-esc="selection[1]"/></label> + </t> + <br/> + </t> + <t t-foreach="widget.selection" t-as="selection"> + <div t-att-style="'width: ' + width + '%;'"> + <span class="oe_radio_input"><input type="radio" t-att-name="widget.uniqueId" t-att-id="widget.uniqueId + '_' + selection[0]" t-att-value="selection[0]"/></span> + </div> + </t> + </t> + <t t-if="!widget.options.horizontal"> + <t t-foreach="widget.selection" t-as="selection"> + <div> + <span class="oe_radio_input"><input type="radio" t-att-id="widget.uniqueId + '_' + selection[0]" t-att-name="widget.uniqueId" t-att-value="selection[0]"/></span><label t-if="!widget.options.no_radiolabel" t-att-for="widget.uniqueId + '_' + selection[0]"><t t-esc="selection[1]"/></label> + </div> + </t> + </t> + </span> + <span t-if="widget.get('effective_readonly')" class="oe_radio_readonly"><t t-esc="widget.get('value')[1]"/></span> + </span> +</t> <t t-name="FieldMany2One"> <span class="oe_form_field oe_form_field_many2one oe_form_field_with_button" t-att-style="widget.node.attrs.style"> <t t-if="widget.get('effective_readonly')"> @@ -1536,8 +1564,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> |