diff options
| author | Kersten Jeremy <jke@openerp.com> | 2014-03-25 18:32:05 +0100 |
|---|---|---|
| committer | Kersten Jeremy <jke@openerp.com> | 2014-03-25 18:32:05 +0100 |
| commit | b2ea875f4ca3f4a9f3032057e19c58f080fa1073 (patch) | |
| tree | 4b913ee5264ef8787d1bf2ad0e04046070ddb310 | |
| parent | 062ee7485c2a3f98a2bb44901096b42472e67df0 (diff) | |
[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
| -rw-r--r-- | addons/base_import/static/src/js/import.js | 2 | ||||
| -rw-r--r-- | 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 @@ <tr class="oe_import_fields"> <!-- Iterate on first row to ensure we have all columns --> <td t-foreach="preview[0]" t-as="column"> - <input placeholder="Don't Import" - class="oe_import_match_field"/> + <input class="oe_import_match_field"/> </td> </tr> <tr t-foreach="preview" t-as="row" class="oe_import_grid-row"> |