[MERGE] forward port of branch saas-3 up to 513cea6

This commit is contained in:
Christophe Simonis 2015-12-08 12:28:41 +01:00
commit 83a4a582fa
3 changed files with 2 additions and 3 deletions

View File

@ -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,

View File

@ -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(', '));

View File

@ -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: