From 217d1720064cdcb56bfe312a09b3db38b75f5243 Mon Sep 17 00:00:00 2001
From: Benjami <benjami94@gmail.com>
Date: Tue, 20 Jun 2023 07:46:50 +0200
Subject: [PATCH] Fix: Admins fields and reset password mail
---
energy_communities/models/res_company.py | 22 +++++++---------------
energy_communities/models/res_users.py | 2 +-
2 files changed, 8 insertions(+), 16 deletions(-)
diff --git a/energy_communities/models/res_company.py b/energy_communities/models/res_company.py
index c51cae32c..798985d1d 100644
--- a/energy_communities/models/res_company.py
+++ b/energy_communities/models/res_company.py
@@ -157,21 +157,13 @@ class ResCompany(models.Model):
# TODO: Get admins depends on hierarcy level
def _get_admins(self):
- # admins = []
- import pdb; pdb.set_trace()
- admins = self.env["res.users"].sudo().search([ # ??
- ("role_line_ids.company_id.id", "=", self.id),
- ("role_line_ids.active", "=", True),
- ("role_line_ids.role_id.code", "=", "role_ce_admin")
- ])
- # role_lines = self.env["res.users.role.line"].sudo().search([
- # ("company_id.id", "=", self.id),
- # ("active", "=", True),
- # ("role_id.code", "=", "role_ce_admin")
- # ])
- # for role_line in role_lines:
- # admins.append(role_line.user_id)
- return admins
+ for rec in self:
+ role_lines = self.env["res.users.role.line"].sudo().search([
+ ("company_id.id", "=", self.id),
+ ("active", "=", True),
+ ("role_id.code", "=", "role_ce_admin")
+ ])
+ rec.admins = role_lines.mapped("user_id")
def add_ce_admin(self, user):
if self.hierarchy_level != 'community':
diff --git a/energy_communities/models/res_users.py b/energy_communities/models/res_users.py
index 8368fbff4..08eed5b88 100644
--- a/energy_communities/models/res_users.py
+++ b/energy_communities/models/res_users.py
@@ -220,7 +220,7 @@ class ResUsers(models.Model):
endpoint = provider_id.reset_password_endpoint.format(
kc_uid = self.oauth_uid
)
- response = requests.put(endpoint, headers=headers, data='["UPDATE_PASSWORD"]')
+ response = requests.put(endpoint, headers=headers, data='["UPDATE_PASSWORD", "VERIFY_EMAIL"]')
if response.status_code != 204:
raise exceptions.UserError(
_('Something went wrong. Mail can not be sended. More details: {}').format(response.json())
--
GitLab