diff options
| author | Raphael Collet <rco@openerp.com> | 2016-11-22 12:04:09 +0100 |
|---|---|---|
| committer | Raphael Collet <rco@openerp.com> | 2017-01-03 16:52:49 +0100 |
| commit | d0ca2d115e8b40308e1ff83bf9e7cc874762fbff (patch) | |
| tree | bdad5e8c9019f14a0416c27612969ae4932519b1 /addons/website_slides | |
| parent | 7543afb0704d624f7abe6a2450a9d7e4a75e158b (diff) | |
[REF] ir_config_parameter: remove `group_ids` and simplify
Add `sudo()` to call `get_param` where necessary, and make the web client use a
controller instead of directly accessing parameters.
Diffstat (limited to 'addons/website_slides')
| -rw-r--r-- | addons/website_slides/controllers/main.py | 2 | ||||
| -rw-r--r-- | addons/website_slides/data/website_slides_data.xml | 1 | ||||
| -rw-r--r-- | addons/website_slides/models/slides.py | 10 |
3 files changed, 6 insertions, 7 deletions
diff --git a/addons/website_slides/controllers/main.py b/addons/website_slides/controllers/main.py index ed9b374c70c..4b2cee0b411 100644 --- a/addons/website_slides/controllers/main.py +++ b/addons/website_slides/controllers/main.py @@ -333,7 +333,7 @@ class WebsiteSlides(http.Controller): # determine if it is embedded from external web page referrer_url = request.httprequest.headers.get('Referer', '') - base_url = request.env['ir.config_parameter'].get_param('web.base.url') + base_url = request.env['ir.config_parameter'].sudo().get_param('web.base.url') is_embedded = referrer_url and not bool(base_url in referrer_url) or False # try accessing slide, and display to corresponding template try: diff --git a/addons/website_slides/data/website_slides_data.xml b/addons/website_slides/data/website_slides_data.xml index 31e8ebf2f9f..c559e07d10d 100644 --- a/addons/website_slides/data/website_slides_data.xml +++ b/addons/website_slides/data/website_slides_data.xml @@ -5,7 +5,6 @@ <record model="ir.config_parameter" id="google_app_key"> <field name="key">website_slides.google_app_key</field> <field name="value">AIzaSyDOWlmDW-7DbLmOR9ZsT5AOEXf4n6TFwQA</field> - <field name="group_ids" eval="[(4, ref('base.group_system'))]" /> </record> <record id="website_menu_slides" model="website.menu"> diff --git a/addons/website_slides/models/slides.py b/addons/website_slides/models/slides.py index e31f9c01415..247094d605f 100644 --- a/addons/website_slides/models/slides.py +++ b/addons/website_slides/models/slides.py @@ -146,7 +146,7 @@ class Channel(models.Model): @api.depends('name') def _compute_website_url(self): super(Channel, self)._compute_website_url() - base_url = self.env['ir.config_parameter'].get_param('web.base.url') + base_url = self.env['ir.config_parameter'].sudo().get_param('web.base.url') for channel in self: if channel.id: # avoid to perform a slug on a not yet saved record in case of an onchange. channel.website_url = '%s/slides/%s' % (base_url, slug(channel)) @@ -347,7 +347,7 @@ class Slide(models.Model): embed_code = fields.Text('Embed Code', readonly=True, compute='_get_embed_code') def _get_embed_code(self): - base_url = self.env['ir.config_parameter'].get_param('web.base.url') + base_url = self.env['ir.config_parameter'].sudo().get_param('web.base.url') for record in self: if record.datas and (not record.document_id or record.slide_type in ['document', 'presentation']): record.embed_code = '<iframe src="%s/slides/embed/%s?page=1" allowFullScreen="true" height="%s" width="%s" frameborder="0"></iframe>' % (base_url, record.id, 315, 420) @@ -365,7 +365,7 @@ class Slide(models.Model): @api.depends('name') def _compute_website_url(self): super(Slide, self)._compute_website_url() - base_url = self.env['ir.config_parameter'].get_param('web.base.url') + base_url = self.env['ir.config_parameter'].sudo().get_param('web.base.url') for slide in self: 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. @@ -473,7 +473,7 @@ class Slide(models.Model): yield record def _post_publication(self): - base_url = self.env['ir.config_parameter'].get_param('web.base.url') + base_url = self.env['ir.config_parameter'].sudo().get_param('web.base.url') for slide in self.filtered(lambda slide: slide.website_published and slide.channel_id.publish_template_id): publish_template = slide.channel_id.publish_template_id html_body = publish_template.with_context({'base_url': base_url}).render_template(publish_template.body_html, 'slide.slide', slide.id) @@ -486,7 +486,7 @@ class Slide(models.Model): @api.one def send_share_email(self, email): - base_url = self.env['ir.config_parameter'].get_param('web.base.url') + base_url = self.env['ir.config_parameter'].sudo().get_param('web.base.url') return self.channel_id.share_template_id.with_context({'email': email, 'base_url': base_url}).send_mail(self.id) # -------------------------------------------------- |
