From f558c049d03d822394b6edf844d8ab862cdb1115 Mon Sep 17 00:00:00 2001 From: Xudong Yang <fanderous@gmail.com> Date: Tue, 31 May 2016 11:37:14 +0800 Subject: [PATCH] [FIX] base_import: t-if does not work with t-jquery Not evaluated, move the condition to the button Closes #12230 --- addons/base_import/static/src/xml/import.xml | 4 ++-- doc/cla/individual/Wizr.md | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 doc/cla/individual/Wizr.md diff --git a/addons/base_import/static/src/xml/import.xml b/addons/base_import/static/src/xml/import.xml index f173263e1878..b67aba5c027d 100644 --- a/addons/base_import/static/src/xml/import.xml +++ b/addons/base_import/static/src/xml/import.xml @@ -413,8 +413,8 @@ <t t-if="error.moreinfo" t-raw="info(error.moreinfo)"/> </t> <t t-extend="ListView.buttons"> - <t t-if='widget.options.import_enabled' t-jquery="button.o_list_button_add" t-operation="after"> - <button type="button" class="btn btn-sm btn-default o_list_button_import"> + <t t-jquery="button.o_list_button_add" t-operation="after"> + <button t-if='widget.options.import_enabled' type="button" class="btn btn-sm btn-default o_list_button_import"> Import </button> </t> diff --git a/doc/cla/individual/Wizr.md b/doc/cla/individual/Wizr.md new file mode 100644 index 000000000000..b99881db1a71 --- /dev/null +++ b/doc/cla/individual/Wizr.md @@ -0,0 +1,11 @@ +China, 2016-04-29 + +I hereby agree to the terms of the Odoo Individual Contributor License +Agreement v1.0. + +I declare that I am authorized and able to make this agreement and sign this +declaration. + +Signed, + +Xudong Yang fanderous@gmail.com https://github.com/Wizr -- GitLab