[MERGE] forward port branch 9.0 up to 3bda87a8d3
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
|
||||
|
||||
@@ -352,7 +352,14 @@ class Slide(models.Model):
|
||||
#link_tracker is not in dependencies, so use it to shorten url only if installed.
|
||||
if self.env.registry.get('link.tracker'):
|
||||
LinkTracker = self.env['link.tracker']
|
||||
res.update({(slide.id, LinkTracker.sudo().create({'url': '%s/slides/slide/%s' % (base_url, slug(slide))}).short_url) for slide in self})
|
||||
res.update({
|
||||
(slide.id,
|
||||
LinkTracker.sudo().create({
|
||||
'url': '%s/slides/slide/%s' % (base_url, slug(slide)),
|
||||
'title': slide.name,
|
||||
}).short_url)
|
||||
for slide in self
|
||||
})
|
||||
else:
|
||||
res.update({(slide.id, '%s/slides/slide/%s' % (base_url, slug(slide))) for slide in self})
|
||||
return res
|
||||
|
||||
Reference in New Issue
Block a user