diff options
Diffstat (limited to 'addons/web')
| -rw-r--r-- | addons/web/controllers/pivot.py | 3 | ||||
| -rw-r--r-- | addons/web/static/src/js/views/search_filters.js | 2 | ||||
| -rw-r--r-- | addons/web/static/src/xml/base_common.xml | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/addons/web/controllers/pivot.py b/addons/web/controllers/pivot.py index 0aff889d5bb..3aebfe3946b 100644 --- a/addons/web/controllers/pivot.py +++ b/addons/web/controllers/pivot.py @@ -6,6 +6,7 @@ import json from odoo import http from odoo.http import request +from odoo.tools import ustr from odoo.tools.misc import xlwt @@ -69,7 +70,7 @@ class TableExporter(http.Controller): # Step 3: writing data x = 0 for row in jdata['rows']: - worksheet.write(y, x, row['indent'] * ' ' + row['title'], header_plain) + worksheet.write(y, x, row['indent'] * ' ' + ustr(row['title']), header_plain) for cell in row['values']: x = x + 1 if cell.get('is_bold', False): diff --git a/addons/web/static/src/js/views/search_filters.js b/addons/web/static/src/js/views/search_filters.js index 8db6288788d..064f4aa1cb3 100644 --- a/addons/web/static/src/js/views/search_filters.js +++ b/addons/web/static/src/js/views/search_filters.js @@ -129,7 +129,7 @@ ExtendedSearchProposition.Field = Widget.extend({ } }, show_inputs: function ($operator) { - var $value = this.$('.o_searchview_extended_prop_value'); + var $value = this.$el.parent(); switch ($operator.val()) { case '∃': case '∄': diff --git a/addons/web/static/src/xml/base_common.xml b/addons/web/static/src/xml/base_common.xml index 1570b5a8717..2af69b61118 100644 --- a/addons/web/static/src/xml/base_common.xml +++ b/addons/web/static/src/xml/base_common.xml @@ -3,7 +3,7 @@ <!-- These templates are accessible in backend and frontend --> -<div t-name="Dialog" class="modal" tabindex="-1" data-backdrop="static" role="dialog" aria-hidden="true"> +<div t-name="Dialog" class="modal" tabindex="-1" data-backdrop="static" role="dialog" aria-hidden="true" t-att-id="_.uniqueId('modal_')"> <div class="modal-dialog"> <div class="modal-content"> <div class="modal-header"> |