diff options
| -rw-r--r-- | addons/auth_oauth/controllers/main.py | 1 | ||||
| -rw-r--r-- | addons/web/static/src/js/view_list.js | 2 | ||||
| -rw-r--r-- | openerp/tools/mail.py | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/addons/auth_oauth/controllers/main.py b/addons/auth_oauth/controllers/main.py index 04b2862f035..60c74eb197c 100644 --- a/addons/auth_oauth/controllers/main.py +++ b/addons/auth_oauth/controllers/main.py @@ -58,7 +58,6 @@ class OAuthLogin(Home): return_url = request.httprequest.url_root + 'auth_oauth/signin' state = self.get_state(provider) params = dict( - debug=request.debug, response_type='token', client_id=provider['client_id'], redirect_uri=return_url, diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js index b08f5ca3bc9..c460cc598f0 100644 --- a/addons/web/static/src/js/view_list.js +++ b/addons/web/static/src/js/view_list.js @@ -1119,7 +1119,7 @@ instance.web.ListView.List = instance.web.Class.extend( /** @lends instance.web. ids = value; } new instance.web.Model(column.relation) - .call('name_get', [ids, this.dataset.context]).done(function (names) { + .call('name_get', [ids, this.dataset.get_context()]).done(function (names) { // FIXME: nth horrible hack in this poor listview record.set(column.id + '__display', _(names).pluck(1).join(', ')); diff --git a/openerp/tools/mail.py b/openerp/tools/mail.py index f8e46c362f4..b78e2e9168e 100644 --- a/openerp/tools/mail.py +++ b/openerp/tools/mail.py @@ -330,7 +330,7 @@ def html_email_clean(html, remove=False, shorten=False, max_length=300, expand_o root = lxml.html.fromstring(html) quote_tags = re.compile(r'(\n(>)+[^\n\r]*)') - signature = re.compile(r'([-]{2,}[\s]?[\r\n]{1,2}[\s\S]+)') + signature = re.compile(r'(^[-]{2,}[\s]?[\r\n]{1,2}[\s\S]+)', re.M) for node in root.iter(): # remove all tails and replace them by a span element, because managing text and tails can be a pain in the ass if node.tail: |