mirror of
https://gitlab.com/hibou-io/hibou-odoo/suite.git
synced 2025-01-20 12:37:31 +02:00
Merge branch 'imp/16.0/h13350_auth_admin__add_wizard_and_use_copy_widget' into '16.0-test'
imp/16.0/h13350_auth_admin__add_wizard_and_use_copy_widget into 16.0-test See merge request hibou-io/hibou-odoo/suite!1657
This commit is contained in:
@@ -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',
|
||||
],
|
||||
}
|
||||
|
||||
@@ -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')
|
||||
|
||||
@@ -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
|
||||
|
@@ -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'
|
||||
|
||||
|
||||
@@ -1,18 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<odoo>
|
||||
|
||||
<record id="res_users_wizard" model="ir.ui.view">
|
||||
<field name="name">Generate Login URL</field>
|
||||
<field name="model">res.users.wizard</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="Generate Login URL">
|
||||
<sheet>
|
||||
<group>
|
||||
<field name="force_login_url" widget="CopyClipboardChar"/>
|
||||
</group>
|
||||
</sheet>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
</odoo>
|
||||
Reference in New Issue
Block a user