← Back to branch summary

~camptocamp/openobject-client-web/7.0-c2c-official

« back to all changes in this revision

Viewing changes to addons/web/static/src/xml/base.xml

  • Committer: Yannick Vaucher
  • Date: 2013-03-11 12:05:25 UTC
  • mfrom: (3656.1.42 openerp-web)
  • Revision ID: yannick.vaucher@camptocamp.com-20130311120525-0xm8sj0t2mn3zex1
[MRG] from official

Show diffs side-by-side

added added

removed removed

Lines of Context:
addons/web/static/src/xml/base.xml
40
40
        <td>
41
41
            <p>
42
42
                <t t-js="d">
43
 
                    var message = d.message ? d.message : d.error.data.fault_code;
 
43
                    var message = d.message ? d.message : d.error.data.message;
44
44
                    d.html_error = context.engine.tools.html_escape(message)
45
45
                        .replace(/\n/g, '<br/>');
46
46
                </t>
1266
1266
</t>
1267
1267
<t t-name="FieldBinaryFileUploader.files">
1268
1268
    <div class="oe_attachments">
1269
 
        <t t-if="widget.get('value')">
1270
 
            <t t-if="!widget.get('effective_readonly')" t-foreach="widget.get('value')" t-as="file">
 
1269
        <t t-if="!widget.get('effective_readonly')">
 
1270
            <t t-foreach="widget.get('value')" t-as="id">
 
1271
                <t t-set="file" t-value="widget.data[id]"/>
1271
1272
                <div class="oe_attachment">
1272
1273
                    <span t-if="(file.upload or file.percent_loaded&lt;100)" t-attf-title="{(file.name || file.filename) + (file.date?' \n('+file.date+')':'' )}" t-attf-name="{file.name || file.filename}">
1273
1274
                        <span class="oe_fileuploader_in_process">...Upload in progress...</span>
1281
1282
                    </t>
1282
1283
                </div>
1283
1284
            </t>
1284
 
            <t t-if="widget.get('effective_readonly')" t-foreach="widget.get('value')" t-as="file">
 
1285
        </t>
 
1286
        <t t-if="widget.get('effective_readonly')">
 
1287
            <t t-foreach="widget.get('value')" t-as="id">
 
1288
                <t t-set="file" t-value="widget.data[id]"/>
1285
1289
                <div>
1286
1290
                    <a t-att-href="file.url" t-attf-title="{(file.name || file.filename) + (file.date?' \n('+file.date+')':'' )}">
1287
1291
                        <t t-raw="file.name || file.filename"/>