diff options
| author | Adrian Torres <adt@odoo.com> | 2019-07-10 14:59:37 +0200 |
|---|---|---|
| committer | Adrian Torres <adt@odoo.com> | 2019-07-17 14:13:12 +0200 |
| commit | 4b38cc6590abcb58a0ca102a06063eb3db7ac1f4 (patch) | |
| tree | cfd11739fc6b4c0cb4b23b54cc6badad4bf5c55e /addons/website | |
| parent | f6fdde96bddfedf8764cd8a73089e44340d476ae (diff) | |
[REM] *: calls to @api.multi
Multi is the default api for methods, it is not necessary to explicitly
decorate methods with it, adds clutter and most people use it because
they see that the rest of the code uses it.
Done with `find . -type f -name '*.py' | xargs sed -i '/@api.multi/d'`
Diffstat (limited to 'addons/website')
| -rw-r--r-- | addons/website/models/ir_ui_view.py | 9 | ||||
| -rw-r--r-- | addons/website/models/mixins.py | 8 | ||||
| -rw-r--r-- | addons/website/models/res_company.py | 3 | ||||
| -rw-r--r-- | addons/website/models/res_config_settings.py | 1 | ||||
| -rw-r--r-- | addons/website/models/res_lang.py | 1 | ||||
| -rw-r--r-- | addons/website/models/res_partner.py | 3 | ||||
| -rw-r--r-- | addons/website/models/res_users.py | 1 | ||||
| -rw-r--r-- | addons/website/models/website.py | 9 | ||||
| -rw-r--r-- | addons/website/models/website_menu.py | 2 | ||||
| -rw-r--r-- | addons/website/models/website_page.py | 5 | ||||
| -rw-r--r-- | addons/website/wizard/base_language_install.py | 1 |
11 files changed, 0 insertions, 43 deletions
diff --git a/addons/website/models/ir_ui_view.py b/addons/website/models/ir_ui_view.py index d6ef2ba728a..e910b414551 100644 --- a/addons/website/models/ir_ui_view.py +++ b/addons/website/models/ir_ui_view.py @@ -24,12 +24,10 @@ class View(models.Model): page_ids = fields.One2many('website.page', 'view_id') first_page_id = fields.Many2one('website.page', string='Website Page', help='First page linked to this view', compute='_compute_first_page_id') - @api.multi def _compute_first_page_id(self): for view in self: view.first_page_id = self.env['website.page'].search([('view_id', '=', view.id)], limit=1) - @api.multi def name_get(self): if not self._context.get('display_website') and not self.env.user.has_group('website.group_multi_website'): return super(View, self).name_get() @@ -42,7 +40,6 @@ class View(models.Model): res.append((view.id, view_name)) return res - @api.multi def write(self, vals): '''COW for ir.ui.view. This way editing websites does not impact other websites. Also this way newly created websites will only @@ -106,7 +103,6 @@ class View(models.Model): return True - @api.multi def _get_specific_views(self): """ Given a view, return a record set containing all the specific views for that view's key. @@ -155,7 +151,6 @@ class View(models.Model): }) return records - @api.multi def unlink(self): '''This implements COU (copy-on-unlink). When deleting a generic page website-specific pages will be created so only the current @@ -296,7 +291,6 @@ class View(models.Model): return view.id return super(View, self).get_view_id(xml_id) - @api.multi def _get_original_view(self): """Given a view, retrieve the original view it was COW'd from. The given view might already be the original one. In that case it will @@ -306,7 +300,6 @@ class View(models.Model): domain = [('key', '=', self.key), ('model_data_id', '!=', None)] return self.with_context(active_test=False).search(domain, limit=1) # Useless limit has multiple xmlid should not be possible - @api.multi def render(self, values=None, engine='ir.qweb', minimal_qcontext=False): """ Render the template. If website is enabled on request, then extend rendering context with website values. """ new_context = dict(self._context) @@ -383,7 +376,6 @@ class View(models.Model): else: return super(View, self).get_default_lang_code() - @api.multi def redirect_to_page_manager(self): return { 'type': 'ir.actions.act_url', @@ -409,7 +401,6 @@ class View(models.Model): if not self._context.get('website_id'): super(View, self)._set_noupdate() - @api.multi def save(self, value, xpath=None): self.ensure_one() current_website = self.env['website'].get_current_website() diff --git a/addons/website/models/mixins.py b/addons/website/models/mixins.py index 39a14b6060e..11f9823c1ca 100644 --- a/addons/website/models/mixins.py +++ b/addons/website/models/mixins.py @@ -23,7 +23,6 @@ class SeoMetadata(models.AbstractModel): website_meta_keywords = fields.Char("Website meta keywords", translate=True) website_meta_og_img = fields.Char("Website opengraph image") - @api.multi def _compute_is_seo_optimized(self): for record in self: record.is_seo_optimized = record.website_meta_title and record.website_meta_description and record.website_meta_keywords @@ -105,7 +104,6 @@ class WebsiteMultiMixin(models.AbstractModel): website_id = fields.Many2one('website', string='Website', help='Restrict publishing to this website.') - @api.multi def can_access_from_current_website(self, website_id=False): can_access = True for record in self: @@ -125,12 +123,10 @@ class WebsitePublishedMixin(models.AbstractModel): can_publish = fields.Boolean('Can publish', compute='_compute_can_publish') website_url = fields.Char('Website URL', compute='_compute_website_url', help='The full URL to access the document through the website.') - @api.multi def _compute_website_url(self): for record in self: record.website_url = '#' - @api.multi def website_publish_button(self): self.ensure_one() if self.env.user.has_group('website.group_website_publisher') and self.website_url != '#': @@ -157,7 +153,6 @@ class WebsitePublishedMixin(models.AbstractModel): return records - @api.multi def write(self, values): if 'website_published' in values and not all(record.can_publish for record in self): raise AccessError(self._get_can_publish_error_message()) @@ -167,7 +162,6 @@ class WebsitePublishedMixin(models.AbstractModel): def create_and_get_website_url(self, **kwargs): return self.create(kwargs).website_url - @api.multi def _compute_can_publish(self): """ This method can be overridden if you need more complex rights management than just 'website_publisher' The publish widget will be hidden and the user won't be able to change the 'website_published' value @@ -193,7 +187,6 @@ class WebsitePublishedMultiMixin(WebsitePublishedMixin): search='_search_website_published', related=False, readonly=False) - @api.multi @api.depends('is_published', 'website_id') def _compute_website_published(self): current_website_id = self._context.get('website_id') @@ -203,7 +196,6 @@ class WebsitePublishedMultiMixin(WebsitePublishedMixin): else: record.website_published = record.is_published - @api.multi def _inverse_website_published(self): for record in self: record.is_published = record.website_published diff --git a/addons/website/models/res_company.py b/addons/website/models/res_company.py index 54a55fec83c..86914d3da04 100644 --- a/addons/website/models/res_company.py +++ b/addons/website/models/res_company.py @@ -7,17 +7,14 @@ from odoo import api, models class Company(models.Model): _inherit = "res.company" - @api.multi def google_map_img(self, zoom=8, width=298, height=298): partner = self.sudo().partner_id return partner and partner.google_map_img(zoom, width, height) or None - @api.multi def google_map_link(self, zoom=8): partner = self.sudo().partner_id return partner and partner.google_map_link(zoom) or None - @api.multi def _get_public_user(self): self.ensure_one() # We need sudo to be able to see public users from others companies too diff --git a/addons/website/models/res_config_settings.py b/addons/website/models/res_config_settings.py index 072605452d7..8811609b65c 100644 --- a/addons/website/models/res_config_settings.py +++ b/addons/website/models/res_config_settings.py @@ -120,7 +120,6 @@ class ResConfigSettings(models.TransientModel): def set_values(self): super(ResConfigSettings, self).set_values() - @api.multi def open_template_user(self): action = self.env.ref('base.action_res_users').read()[0] action['res_id'] = literal_eval(self.env['ir.config_parameter'].sudo().get_param('base.template_portal_user_id', 'False')) diff --git a/addons/website/models/res_lang.py b/addons/website/models/res_lang.py index 147ff26c6d0..c84a212ed5a 100644 --- a/addons/website/models/res_lang.py +++ b/addons/website/models/res_lang.py @@ -8,7 +8,6 @@ from odoo.exceptions import UserError class Lang(models.Model): _inherit = "res.lang" - @api.multi def write(self, vals): if 'active' in vals and not vals['active']: if self.env['website'].search([('language_ids', 'in', self._ids)]): diff --git a/addons/website/models/res_partner.py b/addons/website/models/res_partner.py index 9256f80293d..787e6e6b010 100644 --- a/addons/website/models/res_partner.py +++ b/addons/website/models/res_partner.py @@ -14,7 +14,6 @@ class Partner(models.Model): _name = 'res.partner' _inherit = ['res.partner', 'website.published.multi.mixin'] - @api.multi def google_map_img(self, zoom=8, width=298, height=298): google_maps_api_key = self.env['website'].get_current_website().google_maps_api_key if not google_maps_api_key: @@ -28,7 +27,6 @@ class Partner(models.Model): } return urlplus('//maps.googleapis.com/maps/api/staticmap', params) - @api.multi def google_map_link(self, zoom=10): params = { 'q': '%s, %s %s, %s' % (self.street or '', self.city or '', self.zip or '', self.country_id and self.country_id.display_name or ''), @@ -36,7 +34,6 @@ class Partner(models.Model): } return urlplus('https://maps.google.com/maps', params) - @api.multi def _get_name(self): name = super(Partner, self)._get_name() if self._context.get('display_website') and self.env.user.has_group('website.group_multi_website'): diff --git a/addons/website/models/res_users.py b/addons/website/models/res_users.py index c5fb684888c..55a7611995f 100644 --- a/addons/website/models/res_users.py +++ b/addons/website/models/res_users.py @@ -20,7 +20,6 @@ class ResUsers(models.Model): ('login_key', 'unique (login, website_id)', 'You can not have two users with the same login!'), ] - @api.multi def _has_unsplash_key_rights(self): self.ensure_one() if self.has_group('website.group_website_designer'): diff --git a/addons/website/models/website.py b/addons/website/models/website.py index 3a5b773f81d..aecec32a112 100644 --- a/addons/website/models/website.py +++ b/addons/website/models/website.py @@ -123,7 +123,6 @@ class Website(models.Model): if language_ids and self.default_lang_id not in language_ids: self.default_lang_id = language_ids[0] - @api.multi def _compute_menu(self): Menu = self.env['website.menu'] for website in self: @@ -147,7 +146,6 @@ class Website(models.Model): return res - @api.multi def write(self, values): public_user_to_change_websites = self.env['website'] self._handle_favicon(values) @@ -421,7 +419,6 @@ class Website(models.Model): # Languages # ---------------------------------------------------------- - @api.multi def get_languages(self): self.ensure_one() return self._get_languages() @@ -430,7 +427,6 @@ class Website(models.Model): def _get_languages(self): return [(lg.code, lg.name) for lg in self.language_ids] - @api.multi def get_alternate_languages(self, req=None): langs = [] if req is None: @@ -663,7 +659,6 @@ class Website(models.Model): # check that all args have a converter return all((arg in rule._converters) for arg in args) - @api.multi def enumerate_pages(self, query_string=None, force=False): """ Available pages in the website/CMS. This is mostly used for links generation and can be overridden by modules setting up new HTML @@ -759,13 +754,11 @@ class Website(models.Model): record['__lastmod'] = page['write_date'].date() yield record - @api.multi def get_website_pages(self, domain=[], order='name', limit=None): domain += self.get_current_website().website_domain() pages = self.env['website.page'].search(domain, order='name', limit=limit) return pages - @api.multi def search_pages(self, needle=None, limit=None): name = slugify(needle, max_length=50, path=True) res = [] @@ -808,7 +801,6 @@ class Website(models.Model): 'target': 'self', } - @api.multi def _get_http_domain(self): """Get the domain of the current website, prefixed by http if no scheme is specified. @@ -825,7 +817,6 @@ class Website(models.Model): class BaseModel(models.AbstractModel): _inherit = 'base' - @api.multi def get_base_url(self): """ Returns baseurl about one given record. diff --git a/addons/website/models/website_menu.py b/addons/website/models/website_menu.py index 7a18b3a982d..598d1f10d36 100644 --- a/addons/website/models/website_menu.py +++ b/addons/website/models/website_menu.py @@ -29,7 +29,6 @@ class Menu(models.Model): group_ids = fields.Many2many('res.groups', string='Visible Groups', help="User need to be at least in one of these groups to see the menu") - @api.multi def name_get(self): if not self._context.get('display_website') and not self.env.user.has_group('website.group_multi_website'): return super(Menu, self).name_get() @@ -74,7 +73,6 @@ class Menu(models.Model): res = super(Menu, self).create(vals) return res # Only one record is returned but multiple could have been created - @api.multi def unlink(self): default_menu = self.env.ref('website.main_menu', raise_if_not_found=False) menus_to_remove = self diff --git a/addons/website/models/website_page.py b/addons/website/models/website_page.py index f7423efe415..ea3b8a27657 100644 --- a/addons/website/models/website_page.py +++ b/addons/website/models/website_page.py @@ -48,7 +48,6 @@ class Page(models.Model): not page.date_publish or page.date_publish < fields.Datetime.now() ) - @api.multi def _is_most_specific_page(self, page_to_test): '''This will test if page_to_test is the most specific page in self.''' pages_for_url = self.sorted(key=lambda p: not p.website_id).filtered(lambda page: page.url == page_to_test.url) @@ -64,7 +63,6 @@ class Page(models.Model): ['id', 'name', 'url', 'website_published', 'website_indexed', 'date_publish', 'menu_ids', 'is_homepage', 'website_id'], ) - @api.multi def get_view_identifier(self): """ Get identifier of this page view that may be used to render it """ return self.view_id.id @@ -132,7 +130,6 @@ class Page(models.Model): return url - @api.multi @api.returns('self', lambda value: value.id) def copy(self, default=None): if default: @@ -161,7 +158,6 @@ class Page(models.Model): return new_page.url + '?enable_editor=1' - @api.multi def unlink(self): # When a website_page is deleted, the ORM does not delete its # ir_ui_view. So we got to delete it ourself, but only if the @@ -176,7 +172,6 @@ class Page(models.Model): page.view_id.unlink() return super(Page, self).unlink() - @api.multi def write(self, vals): if 'url' in vals and not vals['url'].startswith('/'): vals['url'] = '/' + vals['url'] diff --git a/addons/website/wizard/base_language_install.py b/addons/website/wizard/base_language_install.py index 1cb850fa605..982645b3278 100644 --- a/addons/website/wizard/base_language_install.py +++ b/addons/website/wizard/base_language_install.py @@ -20,7 +20,6 @@ class BaseLanguageInstall(models.TransientModel): defaults['website_ids'].append(website_id) return defaults - @api.multi def lang_install(self): action = super(BaseLanguageInstall, self).lang_install() lang = self.env['res.lang'].search([('code', '=', self.lang)], limit=1) |
