Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[16.0][MIG] users_ldap_mail: Migration to version 16.0 #512

Merged
merged 13 commits into from
Aug 14, 2023
Merged

[16.0][MIG] users_ldap_mail: Migration to version 16.0 #512

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
b1c739a
ADD Module to use email from LDAP records
dreispt Jul 26, 2013
1d663f2
Port users_ldap_mail to v8
dreispt Sep 2, 2014
500fa4f
Fix 9.0 version
sbidoul Dec 13, 2015
54a3ee3
10.0 Migrate users_ldap_mail module (#651)
StephanRozendaal Dec 27, 2016
9f40508
[MIG] users_ldap_mail
etobella Oct 9, 2017
3f9bc99
[10.0][FIX] users_ldap_mail: Provide defaults to attributes properly
Oct 25, 2018
484bd02
[MIG] users_ldap_mail: Migration to 12.0
Tardo Dec 18, 2019
1eeaccd
[IMP] users_ldap_mail: black, isort, prettier
joao-p-marques Feb 4, 2021
658bc47
[MIG] users_ldap_mail: Migration to 13.0
joao-p-marques Feb 5, 2021
d6df1d3
[MIG] users_ldap_mail: Migration to 14.0
primes2h Jul 17, 2021
2dba752
FIX: force the cast in string in case of the Active directory is prov…
flotho Jan 17, 2023
3046125
[IMP] users_ldap_mail: pre-commit stuff
Yadier-Tecnativa May 11, 2023
e0ab638
[MIG] users_ldap_mail: Migration to 16.0
Yadier-Tecnativa May 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
FIX: force the cast in string in case of the Active directory is prov… 
…inding byte-code strings
  • Loading branch information
@flotho @pedrobaeza
flotho authored and pedrobaeza committed Aug 14, 2023
commit 2dba75232ef675ac7de7a06042d6a91a09ace7e1
2 changes: 1 addition & 1 deletion users_ldap_mail/__manifest__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

{
"name": "LDAP mapping for user name and e-mail",
"version": "14.0.1.0.0",
"version": "14.0.1.0.1",
"depends": ["auth_ldap"],
"author": "Daniel Reis," "Odoo Community Association (OCA)",
"maintainers": ["joao-p-marques"],
Expand Down
45 changes: 0 additions & 45 deletions users_ldap_mail/i18n/en.po
View file
Open in desktop

This file was deleted.

19 changes: 17 additions & 2 deletions users_ldap_mail/i18n/users_ldap_mail.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 13.0\n"
"Project-Id-Version: Odoo Server 14.0\n"
"Report-Msgid-Bugs-To: \n"
"Last-Translator: \n"
"Language-Team: \n"
Expand All @@ -25,14 +25,29 @@ msgstr ""
msgid "Company LDAP configuration"
msgstr ""

#. module: users_ldap_mail
#: model:ir.model.fields,field_description:users_ldap_mail.field_res_company_ldap__display_name
msgid "Display Name"
msgstr ""

#. module: users_ldap_mail
#: model:ir.model.fields,field_description:users_ldap_mail.field_res_company_ldap__mail_attribute
msgid "E-mail attribute"
msgstr ""

#. module: users_ldap_mail
#: model:ir.model.fields,field_description:users_ldap_mail.field_res_company_ldap__id
msgid "ID"
msgstr ""

#. module: users_ldap_mail
#: model:ir.model.fields,help:users_ldap_mail.field_res_company_ldap__mail_attribute
msgid "LDAP attribute to use to retrieve em-mail address."
msgid "LDAP attribute to use to retrieve e-mail address."
msgstr ""

#. module: users_ldap_mail
#: model:ir.model.fields,field_description:users_ldap_mail.field_res_company_ldap____last_update
msgid "Last Modified on"
msgstr ""

#. module: users_ldap_mail
Expand Down
4 changes: 2 additions & 2 deletions users_ldap_mail/models/users_ldap_model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

import logging

from odoo import fields, models
from odoo import fields, models, tools

_logger = logging.getLogger(__name__)

Expand Down Expand Up @@ -43,7 +43,7 @@ def _map_ldap_attributes(self, conf, login, ldap_entry):
for value_key, conf_name in mapping:
try:
if conf[conf_name]:
values[value_key] = ldap_entry[1][conf[conf_name]][0]
values[value_key] = tools.ustr(ldap_entry[1][conf[conf_name]][0])
except KeyError:
_logger.warning(
'No LDAP attribute "%s" found for login "%s"'
Expand Down