From 4ebcd8b1299c56133d510c73f3f11796bdc24882 Mon Sep 17 00:00:00 2001 From: Salomon Chambi Date: Thu, 5 Oct 2023 16:44:27 +0000 Subject: [PATCH] [FIX] auth_admin: delete wizard and dead method H13350 --- auth_admin/__manifest__.py | 2 -- auth_admin/models/res_users.py | 20 ++------------------ auth_admin/security/ir.model.access.csv | 2 -- auth_admin/wizard/portal_wizard.py | 15 --------------- auth_admin/wizard/res_users_wizard_views.xml | 18 ------------------ 5 files changed, 2 insertions(+), 55 deletions(-) delete mode 100644 auth_admin/security/ir.model.access.csv delete mode 100644 auth_admin/wizard/res_users_wizard_views.xml diff --git a/auth_admin/__manifest__.py b/auth_admin/__manifest__.py index 03dd16cb..ab95847e 100755 --- a/auth_admin/__manifest__.py +++ b/auth_admin/__manifest__.py @@ -23,8 +23,6 @@ Out of the box, only allows you to generate a login for an 'External User', e.g. 'auto_install': False, 'data': [ 'views/res_users.xml', - 'security/ir.model.access.csv', 'wizard/portal_wizard_views.xml', - 'wizard/res_users_wizard_views.xml', ], } diff --git a/auth_admin/models/res_users.py b/auth_admin/models/res_users.py index fa7e7907..f1d1f48f 100755 --- a/auth_admin/models/res_users.py +++ b/auth_admin/models/res_users.py @@ -1,4 +1,4 @@ -from odoo import models, api, exceptions, fields, _ +from odoo import models, api, exceptions from odoo.http import request from datetime import datetime from time import mktime @@ -77,17 +77,7 @@ class ResUsers(models.Model): login_url = admin_auth_generate_login(self.env, self) if login_url: - wizard = self.env['res.users.wizard'].create({ - 'force_login_url': login_url, - }) - return { - 'name': _('Generate Login URL'), - 'type': 'ir.actions.act_window', - 'view_mode': 'form', - 'res_model': 'res.users.wizard', - 'res_id': wizard.id, - 'target': 'new', - } + raise exceptions.UserError(login_url) return False @@ -100,9 +90,3 @@ class ResUsers(models.Model): str(request.session.uid) + ' original user id: ' + str(request.session.auth_admin)) else: raise - - -class ResUsersWizard(models.TransientModel): - _name = 'res.users.wizard' - - force_login_url = fields.Char(string='Force Login URL') diff --git a/auth_admin/security/ir.model.access.csv b/auth_admin/security/ir.model.access.csv deleted file mode 100644 index 2d4b394a..00000000 --- a/auth_admin/security/ir.model.access.csv +++ /dev/null @@ -1,2 +0,0 @@ -id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink -access_auth_admin,access.res.users.wizard,model_res_users_wizard,base.group_user,1,1,1,1 diff --git a/auth_admin/wizard/portal_wizard.py b/auth_admin/wizard/portal_wizard.py index ed0b5cd0..267d6ad7 100755 --- a/auth_admin/wizard/portal_wizard.py +++ b/auth_admin/wizard/portal_wizard.py @@ -2,21 +2,6 @@ from odoo import api, fields, models, _ from ..models.res_users import admin_auth_generate_login -class PortalWizard(models.TransientModel): - _inherit = 'portal.wizard' - - def admin_auth_generate_login(self): - self.ensure_one() - self.user_ids.admin_auth_generate_login() - return { - "type": "ir.actions.act_window", - "res_model": self._name, - "views": [[False, "form"]], - "res_id": self.id, - "target": "new", - } - - class PortalWizardUser(models.TransientModel): _inherit = 'portal.wizard.user' diff --git a/auth_admin/wizard/res_users_wizard_views.xml b/auth_admin/wizard/res_users_wizard_views.xml deleted file mode 100644 index f7f0dba0..00000000 --- a/auth_admin/wizard/res_users_wizard_views.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - Generate Login URL - res.users.wizard - -
- - - - - -
-
-
- -