From b2ea875f4ca3f4a9f3032057e19c58f080fa1073 Mon Sep 17 00:00:00 2001 From: Kersten Jeremy Date: Tue, 25 Mar 2014 18:32:05 +0100 Subject: [PATCH] [FIX] IE9 - Move the placeholder in base_import from view to js, to use the mechanism of select2 and not the jquery.placeholder. Else, jq.placeholder override the select2 value, because the style option is in reality an input in dom. bzr revid: jke@openerp.com-20140325173205-n2q0dw1kynlkint7 --- addons/base_import/static/src/js/import.js | 2 +- addons/base_import/static/src/xml/import.xml | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/addons/base_import/static/src/js/import.js b/addons/base_import/static/src/js/import.js index 1238bc9570f..78cb09001a9 100644 --- a/addons/base_import/static/src/js/import.js +++ b/addons/base_import/static/src/js/import.js @@ -285,7 +285,7 @@ openerp.base_import = function (instance) { callback(item_finder(default_value)); }, - + placeholder: _t('Don\'t import'), width: 'resolve', dropdownCssClass: 'oe_import_selector' }); diff --git a/addons/base_import/static/src/xml/import.xml b/addons/base_import/static/src/xml/import.xml index 97bf3e66f7a..8d7155912e6 100644 --- a/addons/base_import/static/src/xml/import.xml +++ b/addons/base_import/static/src/xml/import.xml @@ -347,8 +347,7 @@ - +