diff --git a/model/res_users.py b/model/res_users.py index 715ccc1ac22d0cb60e4dad959028697e7b80bdd2_bW9kZWwvcmVzX3VzZXJzLnB5..bcd11c9d158712f6f1ae75759bdfdf4604841b1b_bW9kZWwvcmVzX3VzZXJzLnB5 100644 --- a/model/res_users.py +++ b/model/res_users.py @@ -6,8 +6,9 @@ import passlib import openerp +from openerp import _ from openerp import api from openerp import models from openerp import fields from openerp import SUPERUSER_ID from openerp.exceptions import ValidationError @@ -9,13 +10,9 @@ from openerp import api from openerp import models from openerp import fields from openerp import SUPERUSER_ID from openerp.exceptions import ValidationError -# import real addons name of base.res.res_users in order to call it without -# user the super() call -from openerp.addons.base.res.res_users import res_users as baseuser -from openerp import _ _logger = logging.getLogger(__name__) @@ -18,8 +15,11 @@ _logger = logging.getLogger(__name__) -class res_users(models.Model): +class ResUser(models.Model): + """Add SAML login capabilities to Odoo users. + """ + _inherit = 'res.users' saml_provider_id = fields.Many2one( @@ -232,12 +232,7 @@ token_osv = self.pool.get('auth_saml.token') try: - baseuser.check_credentials( - self, - cr, - uid, - token - ) + super(ResUser, self).check_credentials(cr, uid, token) except ( openerp.exceptions.AccessDenied, @@ -279,7 +274,7 @@ 'password_crypt': False, }) - return super(res_users, self).write(vals) + return super(ResUser, self).write(vals) @api.model def _allow_saml_and_password(self):