diff options
| author | Aaron Bohy <aab@odoo.com> | 2015-07-24 09:12:19 +0200 |
|---|---|---|
| committer | Aaron Bohy <aab@odoo.com> | 2015-07-29 08:41:03 +0200 |
| commit | a21fe28b8deb931850a2e1c2fcd095abe170f0d4 (patch) | |
| tree | d5fa30b96531c5b95bf3a95bf54142e66896bcb2 | |
| parent | 71e9de4ecc8201911ca7ce17e7aad1349bb8610b (diff) | |
[FIX] base_import: action button 'Import'
Adapt the template according to the refactoring of the parent commit.
| -rw-r--r-- | addons/base_import/static/src/css/import.css | 5 | ||||
| -rw-r--r-- | addons/base_import/static/src/js/import.js | 2 | ||||
| -rw-r--r-- | addons/base_import/static/src/xml/import.xml | 9 |
3 files changed, 6 insertions, 10 deletions
diff --git a/addons/base_import/static/src/css/import.css b/addons/base_import/static/src/css/import.css index 498b5e8f082..cdea7a7b58b 100644 --- a/addons/base_import/static/src/css/import.css +++ b/addons/base_import/static/src/css/import.css @@ -68,10 +68,7 @@ /* ----------- INITIAL SETUP ------------ */ -.openerp .oe_list_buttons .oe_alternative { - visibility: visible; -} -.openerp .oe_list_buttons.oe_editing .oe_list_button_import { +.openerp .oe_list_buttons.oe_editing .o_list_button_import { display: none; } diff --git a/addons/base_import/static/src/js/import.js b/addons/base_import/static/src/js/import.js index 779655bbef9..b5686ce46f8 100644 --- a/addons/base_import/static/src/js/import.js +++ b/addons/base_import/static/src/js/import.js @@ -60,7 +60,7 @@ ListView.include({ } this._super.apply(this, arguments); // Sets this.$buttons if(add_button) { - this.$buttons.on('click', '.oe_list_button_import', function() { + this.$buttons.on('click', '.o_list_button_import', function() { self.do_action({ type: 'ir.actions.client', tag: 'import', diff --git a/addons/base_import/static/src/xml/import.xml b/addons/base_import/static/src/xml/import.xml index b20c13e64e5..677d50d4dc1 100644 --- a/addons/base_import/static/src/xml/import.xml +++ b/addons/base_import/static/src/xml/import.xml @@ -398,11 +398,10 @@ <t t-if="error.moreinfo" t-raw="info(error.moreinfo)"/> </t> <t t-extend="ListView.buttons"> - <t t-jquery="span.oe_alternative"> - this.attr('t-if', 'widget.options.import_enabled'); - </t> - <t t-jquery="span.oe_alternative" t-operation="append"> - <a href="#" class="oe_bold oe_list_button_import">Import</a> + <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"> + Import + </button> </t> </t> </templates> |