diff options
| author | Frédéric van der Essen <fva@openerp.com> | 2013-07-12 14:11:48 +0200 |
|---|---|---|
| committer | Frédéric van der Essen <fva@openerp.com> | 2013-07-12 14:11:48 +0200 |
| commit | 16d3b79dfd293a0430efb7cd97dd62944853c86b (patch) | |
| tree | b350ac948f708c73ff21c3f6708e655c97e2f413 /addons/web/static/src/xml | |
| parent | ccc2dd61ced6a76334458be6056bc94075964cbe (diff) | |
| parent | 17db55200b31494427d26803da93b59be90c239d (diff) | |
[MERGE] from upstream
bzr revid: fva@openerp.com-20130712121148-0ys14v8jc33t6sf5
Diffstat (limited to 'addons/web/static/src/xml')
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index a459486bf05..643bca0e798 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -654,7 +654,7 @@ <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"/> + <input type="hidden" name="session_id" t-att-value="widget.session.session_id" t-if="widget.session.override_session"/> <span>Add...</span> </t> </li> @@ -1320,7 +1320,7 @@ <div t-attf-class="oe_hidden_input_file #{fileupload_class or ''}" t-att-style="fileupload_style"> <form class="oe_form_binary_form" t-att-target="fileupload_id" method="post" enctype="multipart/form-data" t-att-action="fileupload_action || '/web/binary/upload'"> - <input type="hidden" name="session_id" value=""/> + <input type="hidden" name="session_id" value="" t-if="widget.session.override_session"/> <input type="hidden" name="callback" t-att-value="fileupload_id"/> <t t-raw="__content__"/> <input type="file" class="oe_form_binary_file" name="ufile" t-if="widget.widget!='image'"/> @@ -1372,7 +1372,7 @@ <t t-set="fileupload_action" t-translation="off">/web/binary/upload_attachment</t> <input type="hidden" name="model" t-att-value="widget.view.model"/> <input type="hidden" name="id" value="0"/> - <input type="hidden" name="session_id" t-att-value="widget.session.session_id"/> + <input type="hidden" name="session_id" t-att-value="widget.session.session_id" t-if="widget.session.override_session"/> </t> </div> </div> @@ -1835,7 +1835,7 @@ <t t-name="ImportDataView"> <form name="import_data" id="import_data" action="" method="post" enctype="multipart/form-data" class="oe_import oe_import_no_result"> - <input type="hidden" name="session_id" t-att-value="widget.session.session_id"/> + <input type="hidden" name="session_id" t-att-value="widget.session.session_id" t-if="widget.session.override_session"/> <h2 class="separator horizontal">1. Import a .CSV file</h2> <p>Select a .CSV file to import. If you need a sample of file to import, you should use the export tool with the "Import Compatible" option. |