diff options
| author | Raphael Collet <rco@odoo.com> | 2019-06-17 14:29:51 +0000 |
|---|---|---|
| committer | Raphael Collet <rco@odoo.com> | 2019-07-04 11:32:22 +0000 |
| commit | 368e9530f4e6366bffa9d1289ed064bc954f8531 (patch) | |
| tree | 50162953e1adb331cb3852fd38da2631f2ece966 /addons | |
| parent | b7fd679a6c41dbb694c6fb2ce4911798de0424b1 (diff) | |
[REF] *: `record.env.user._is_XXX()` -> `record.env.is_XXX()`
Superuser mode implies `record.env.is_XXX()`.
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/account/controllers/onboarding.py | 4 | ||||
| -rw-r--r-- | addons/account/models/account_move.py | 4 | ||||
| -rw-r--r-- | addons/account/models/chart_template.py | 2 | ||||
| -rw-r--r-- | addons/gamification/models/badge.py | 2 | ||||
| -rw-r--r-- | addons/google_drive/models/google_drive.py | 2 | ||||
| -rw-r--r-- | addons/hr/models/hr_employee.py | 4 | ||||
| -rw-r--r-- | addons/hr_holidays/models/hr_leave.py | 4 | ||||
| -rw-r--r-- | addons/l10n_it_edi/models/account_invoice.py | 2 | ||||
| -rw-r--r-- | addons/mail/models/mail_activity.py | 2 | ||||
| -rw-r--r-- | addons/mail/models/mail_message.py | 6 | ||||
| -rw-r--r-- | addons/payment/wizards/payment_acquirer_onboarding_wizard.py | 2 | ||||
| -rw-r--r-- | addons/sale/controllers/onboarding.py | 2 | ||||
| -rw-r--r-- | addons/utm/models/utm_mixin.py | 4 | ||||
| -rw-r--r-- | addons/website_forum/models/forum.py | 10 | ||||
| -rw-r--r-- | addons/website_slides/models/slide_channel.py | 4 |
15 files changed, 27 insertions, 27 deletions
diff --git a/addons/account/controllers/onboarding.py b/addons/account/controllers/onboarding.py index 01eeb07fc81..34e30570563 100644 --- a/addons/account/controllers/onboarding.py +++ b/addons/account/controllers/onboarding.py @@ -11,7 +11,7 @@ class OnboardingController(http.Controller): the permission to see it. """ company = request.env.company - if not request.env.user._is_admin() or \ + if not request.env.is_admin() or \ company.account_invoice_onboarding_state == 'closed': return {} @@ -29,7 +29,7 @@ class OnboardingController(http.Controller): the permission to see it. """ company = request.env.company - if not request.env.user._is_admin() or \ + if not request.env.is_admin() or \ company.account_dashboard_onboarding_state == 'closed': return {} diff --git a/addons/account/models/account_move.py b/addons/account/models/account_move.py index f0566d73d53..a5560749996 100644 --- a/addons/account/models/account_move.py +++ b/addons/account/models/account_move.py @@ -1032,7 +1032,7 @@ class AccountMove(models.Model): let the user manually change it. """ # Check user group. - system_user = self.env.user._is_system() + system_user = self.env.is_system() if not system_user: return @@ -1065,7 +1065,7 @@ class AccountMove(models.Model): def _inverse_invoice_sequence_number_next(self): ''' Set the number_next on the sequence related to the invoice/bill/refund''' # Check user group. - if not self.env.user._is_admin(): + if not self.env.is_admin(): return # Set the next number in the sequence. diff --git a/addons/account/models/chart_template.py b/addons/account/models/chart_template.py index 4ec8f31a0dd..837464563b6 100644 --- a/addons/account/models/chart_template.py +++ b/addons/account/models/chart_template.py @@ -192,7 +192,7 @@ class AccountChartTemplate(models.Model): company = self.env.company # Ensure everything is translated to the company's language, not the user's one. self = self.with_context(lang=company.partner_id.lang) - if not self.env.user._is_admin(): + if not self.env.is_admin(): raise AccessError(_("Only administrators can load a charf of accounts")) existing_accounts = self.env['account.account'].search([('company_id', '=', company.id)]) diff --git a/addons/gamification/models/badge.py b/addons/gamification/models/badge.py index f092a6dd522..b0483dbeae7 100644 --- a/addons/gamification/models/badge.py +++ b/addons/gamification/models/badge.py @@ -251,7 +251,7 @@ class GamificationBadge(models.Model): :param badge_id: the granted badge id :return: integer representing the permission. """ - if self.env.user._is_admin(): + if self.env.is_admin(): return self.CAN_GRANT if self.rule_auth == 'nobody': diff --git a/addons/google_drive/models/google_drive.py b/addons/google_drive/models/google_drive.py index b22114cff25..c937acaa356 100644 --- a/addons/google_drive/models/google_drive.py +++ b/addons/google_drive/models/google_drive.py @@ -52,7 +52,7 @@ class GoogleDrive(models.Model): def get_access_token(self, scope=None): Config = self.env['ir.config_parameter'].sudo() google_drive_refresh_token = Config.get_param('google_drive_refresh_token') - user_is_admin = self.env['res.users'].browse(self.env.user.id)._is_admin() + user_is_admin = self.env.is_admin() if not google_drive_refresh_token: if user_is_admin: dummy, action_id = self.env['ir.model.data'].get_object_reference('base_setup', 'action_general_configuration') diff --git a/addons/hr/models/hr_employee.py b/addons/hr/models/hr_employee.py index 1ca2d8bdf48..0c76f4ccd19 100644 --- a/addons/hr/models/hr_employee.py +++ b/addons/hr/models/hr_employee.py @@ -6,7 +6,7 @@ from random import choice from string import digits from werkzeug import url_encode -from odoo import api, fields, models, tools, SUPERUSER_ID, _ +from odoo import api, fields, models, tools, _ from odoo.exceptions import ValidationError, AccessError from odoo.modules.module import get_module_resource @@ -322,7 +322,7 @@ class HrEmployeePrivate(models.Model): to post messages as the correct user. """ real_user = self.env.context.get('binary_field_real_user') - if self.env.user.id == SUPERUSER_ID and real_user: + if self.env.is_superuser() and real_user: self = self.with_user(real_user) return self diff --git a/addons/hr_holidays/models/hr_leave.py b/addons/hr_holidays/models/hr_leave.py index 80d83717103..f4223cdddeb 100644 --- a/addons/hr_holidays/models/hr_leave.py +++ b/addons/hr_holidays/models/hr_leave.py @@ -9,7 +9,7 @@ import math from datetime import datetime, time from pytz import timezone, UTC -from odoo import api, fields, models, tools, SUPERUSER_ID +from odoo import api, fields, models, tools from odoo.addons.resource.models.resource import float_to_time, HOURS_PER_DAY from odoo.exceptions import AccessError, UserError, ValidationError from odoo.tools import float_compare @@ -823,7 +823,7 @@ class HolidaysRequest(models.Model): def _check_approval_update(self, state): """ Check if target state is achievable. """ - if self.env.user.id == SUPERUSER_ID: + if self.env.is_superuser(): return current_employee = self.env['hr.employee'].search([('user_id', '=', self.env.uid)], limit=1) diff --git a/addons/l10n_it_edi/models/account_invoice.py b/addons/l10n_it_edi/models/account_invoice.py index 649b2d2c683..3d46670c05f 100644 --- a/addons/l10n_it_edi/models/account_invoice.py +++ b/addons/l10n_it_edi/models/account_invoice.py @@ -337,7 +337,7 @@ class AccountMove(models.Model): else: _logger.info(_('Company not found. The company\'s user is set by default.')) - if not self.env.user._is_superuser(): + if not self.env.is_superuser(): if self.env.company != company: raise UserError(_("You can only import invoice concern your current company: %s") % self.env.company.display_name) diff --git a/addons/mail/models/mail_activity.py b/addons/mail/models/mail_activity.py index 352b06e9025..97ef1011eff 100644 --- a/addons/mail/models/mail_activity.py +++ b/addons/mail/models/mail_activity.py @@ -242,7 +242,7 @@ class MailActivity(models.Model): * unlink: access rule OR (``mail_post_access`` or write) rights on related documents); """ - if self.env.user._is_superuser(): + if self.env.is_superuser(): return self if not self.check_access_rights(operation, raise_exception=False): return self.env[self._name] diff --git a/addons/mail/models/mail_message.py b/addons/mail/models/mail_message.py index 346eb80b2bb..58f04f63f45 100644 --- a/addons/mail/models/mail_message.py +++ b/addons/mail/models/mail_message.py @@ -9,7 +9,7 @@ from operator import itemgetter from email.utils import formataddr from openerp.http import request -from odoo import _, api, fields, models, modules, SUPERUSER_ID, tools +from odoo import _, api, fields, models, modules, tools from odoo.exceptions import UserError, AccessError from odoo.osv import expression from odoo.tools import groupby @@ -637,7 +637,7 @@ class Message(models.Model): - otherwise: remove the id """ # Rules do not apply to administrator - if self._uid == SUPERUSER_ID: + if self.env.is_superuser(): return super(Message, self)._search( args, offset=offset, limit=limit, order=order, count=count, access_rights_uid=access_rights_uid) @@ -739,7 +739,7 @@ class Message(models.Model): model_record_ids.setdefault(vals['model'], set()).add(vals['res_id']) return model_record_ids - if self._uid == SUPERUSER_ID: + if self.env.is_superuser(): return # Non employees see only messages with a subtype (aka, not internal logs) if not self.env['res.users'].has_group('base.group_user'): diff --git a/addons/payment/wizards/payment_acquirer_onboarding_wizard.py b/addons/payment/wizards/payment_acquirer_onboarding_wizard.py index 39c72656bf8..18e20567e19 100644 --- a/addons/payment/wizards/payment_acquirer_onboarding_wizard.py +++ b/addons/payment/wizards/payment_acquirer_onboarding_wizard.py @@ -44,7 +44,7 @@ class PaymentWizard(models.TransientModel): ('company_id', '=', env.company.id)], limit=1) def _get_default_payment_acquirer_onboarding_value(self, key): - if not self.env.user._is_admin(): + if not self.env.is_admin(): raise UserError(_("Only administrators can access this data.")) if self._data_fetched: diff --git a/addons/sale/controllers/onboarding.py b/addons/sale/controllers/onboarding.py index 433824afdc9..1d62325f669 100644 --- a/addons/sale/controllers/onboarding.py +++ b/addons/sale/controllers/onboarding.py @@ -14,7 +14,7 @@ class OnboardingController(http.Controller): the permission to see it. """ company = request.env.company - if not request.env.user._is_admin() or \ + if not request.env.is_admin() or \ company.sale_quotation_onboarding_state == 'closed': return {} diff --git a/addons/utm/models/utm_mixin.py b/addons/utm/models/utm_mixin.py index 6d9413c51d9..e77325d32c3 100644 --- a/addons/utm/models/utm_mixin.py +++ b/addons/utm/models/utm_mixin.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. -from odoo import api, fields, models, SUPERUSER_ID +from odoo import api, fields, models from odoo.http import request @@ -22,7 +22,7 @@ class UtmMixin(models.AbstractModel): values = super(UtmMixin, self).default_get(fields) # We ignore UTM for salemen, except some requests that could be done as superuser_id to bypass access rights. - if self.env.uid != SUPERUSER_ID and self.env.user.has_group('sales_team.group_sale_salesman'): + if not self.env.is_superuser() and self.env.user.has_group('sales_team.group_sale_salesman'): return values for url_param, field_name, cookie_name in self.env['utm.mixin'].tracking_fields(): diff --git a/addons/website_forum/models/forum.py b/addons/website_forum/models/forum.py index c18f37fc1d1..329b60f7d03 100644 --- a/addons/website_forum/models/forum.py +++ b/addons/website_forum/models/forum.py @@ -255,7 +255,7 @@ class Post(models.Model): user = self.env.user # Won't impact sitemap, search() in converter is forced as public user - if user._is_admin(): + if self.env.is_admin(): return [(1, '=', 1)] req = """ @@ -344,7 +344,7 @@ class Post(models.Model): @api.multi def _get_post_karma_rights(self): user = self.env.user - is_admin = user._is_admin() + is_admin = self.env.is_admin() # sudoed recordset instead of individual posts so values can be # prefetched in bulk for post, post_sudo in zip(self, self.sudo()): @@ -867,7 +867,7 @@ class Vote(models.Model): @api.model def create(self, vals): # can't modify owner of a vote - if not self.env.user._is_admin(): + if not self.env.is_admin(): vals.pop('user_id', None) vote = super(Vote, self).create(vals) @@ -882,7 +882,7 @@ class Vote(models.Model): @api.multi def write(self, values): # can't modify owner of a vote - if not self.env.user._is_admin(): + if not self.env.is_admin(): values.pop('user_id', None) for vote in self: @@ -904,7 +904,7 @@ class Vote(models.Model): post = self.post_id if vals.get('post_id'): post = self.env['forum.post'].browse(vals.get('post_id')) - if not self.env.user._is_admin(): + if not self.env.is_admin(): # own post check if self._uid == post.create_uid.id: raise UserError(_('It is not allowed to vote for its own post.')) diff --git a/addons/website_slides/models/slide_channel.py b/addons/website_slides/models/slide_channel.py index 8494a812fe6..c157f692599 100644 --- a/addons/website_slides/models/slide_channel.py +++ b/addons/website_slides/models/slide_channel.py @@ -259,7 +259,7 @@ class Channel(models.Model): for record in self: if not record.can_upload: record.can_publish = False - elif record.user_id == self.env.user or self.env.user._is_superuser(): + elif record.user_id == self.env.user or self.env.is_superuser(): record.can_publish = True else: record.can_publish = self.env.user.has_group('website.group_website_publisher') @@ -314,7 +314,7 @@ class Channel(models.Model): @api.model def create(self, vals): # Ensure creator is member of its channel it is easier for him to manage it (unless it is odoobot) - if not vals.get('channel_partner_ids') and not self.env.user._is_superuser(): + if not vals.get('channel_partner_ids') and not self.env.is_superuser(): vals['channel_partner_ids'] = [(0, 0, { 'partner_id': self.env.user.partner_id.id })] |
