[MERGE] forward port branch saas-11 up to 285a9d0406
This commit is contained in:
@@ -30,5 +30,6 @@ class ResPartner(models.Model):
|
||||
if partner_id: # Modifying existing partner
|
||||
self.browse(partner_id).write(partner)
|
||||
else:
|
||||
partner['lang'] = self.env.user.lang
|
||||
partner_id = self.create(partner).id
|
||||
return partner_id
|
||||
|
||||
@@ -371,7 +371,10 @@ class Slide(models.Model):
|
||||
if slide.id: # avoid to perform a slug on a not yet saved record in case of an onchange.
|
||||
# link_tracker is not in dependencies, so use it to shorten url only if installed.
|
||||
if self.env.registry.get('link.tracker'):
|
||||
url = self.env['link.tracker'].sudo().create({'url': '%s/slides/slide/%s' % (base_url, slug(slide))}).short_url
|
||||
url = self.env['link.tracker'].sudo().create({
|
||||
'url': '%s/slides/slide/%s' % (base_url, slug(slide)),
|
||||
'title': slide.name,
|
||||
}).short_url
|
||||
else:
|
||||
url = '%s/slides/slide/%s' % (base_url, slug(slide))
|
||||
slide.website_url = url
|
||||
|
||||
Reference in New Issue
Block a user