diff --git a/energy_communities/models/res_company.py b/energy_communities/models/res_company.py index c51cae32c85a4af5080aba3171b12a1de3eda32d..798985d1de8c8d671ab3787f16c473209a7aa35d 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 8368fbff4460f53c6342ec62c26b6e9a651c58f5..08eed5b88065ee1c7fab8eff5bbf40f7f0c3f763 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())