diff --git a/addons/website_blog/models/website_blog.py b/addons/website_blog/models/website_blog.py index 3eb74fd9..86ce76ac 100644 --- a/addons/website_blog/models/website_blog.py +++ b/addons/website_blog/models/website_blog.py @@ -233,7 +233,7 @@ class BlogPost(models.Model): return super(BlogPost, self).get_access_action(access_uid) return { 'type': 'ir.actions.act_url', - 'url': self.url, + 'url': self.website_url, 'target': 'self', 'target_type': 'public', 'res_id': self.id, diff --git a/addons/website_event/models/event.py b/addons/website_event/models/event.py index 20727a35..ec7c23c7 100644 --- a/addons/website_event/models/event.py +++ b/addons/website_event/models/event.py @@ -79,7 +79,7 @@ class Event(models.Model): event.menu_id = root_menu existing_page_names = event.menu_id.child_id.mapped('name') - required_page_names = [entry[0] for entry in self._get_menu_entries()] + required_page_names = [entry[0] for entry in event._get_menu_entries()] standard_page_names = self._get_standard_menu_entries_names() # remove entries that should not exist anymore @@ -87,11 +87,11 @@ class Event(models.Model): submenu_to_delete.unlink() # create missing entries - for sequence, (name, url, xml_id) in enumerate(self._get_menu_entries()): + for sequence, (name, url, xml_id) in enumerate(event._get_menu_entries()): if name not in existing_page_names: if not url: - newpath = self.env['website'].new_page(name + ' ' + self.name, template=xml_id, ispage=False)['url'] - url = "/event/" + slug(self) + "/page/" + newpath[1:] + newpath = self.env['website'].new_page(name + ' ' + event.name, template=xml_id, ispage=False)['url'] + url = "/event/" + slug(event) + "/page/" + newpath[1:] self.env['website.menu'].create({ 'name': name, 'url': url, diff --git a/addons/website_forum/models/forum.py b/addons/website_forum/models/forum.py index ef13e3b2..3779476f 100644 --- a/addons/website_forum/models/forum.py +++ b/addons/website_forum/models/forum.py @@ -509,7 +509,7 @@ class Post(models.Model): self.env.user.sudo().add_karma(post.forum_id.karma_gen_answer_accept * mult) if 'tag_ids' in vals: tag_ids = set(tag.get('id') for tag in self.resolve_2many_commands('tag_ids', vals['tag_ids'])) - if any(set(post.tag_ids) != tag_ids for post in self) and any(self.env.user.karma < post.forum_id.karma_edit_retag for post in self): + if any(set(post.tag_ids.ids) != tag_ids for post in self) and any(self.env.user.karma < post.forum_id.karma_edit_retag for post in self): raise KarmaError(_('Not enough karma to retag.')) if any(key not in trusted_keys for key in vals) and any(not post.can_edit for post in self): raise KarmaError('Not enough karma to edit a post.') diff --git a/addons/website_forum/views/website_forum.xml b/addons/website_forum/views/website_forum.xml index 47f739b9..0016d5ce 100644 --- a/addons/website_forum/views/website_forum.xml +++ b/addons/website_forum/views/website_forum.xml @@ -620,7 +620,7 @@

- +