From b1c739a72e45b2d98d547c7762b045254128fa46 Mon Sep 17 00:00:00 2001 From: Daniel Reis Date: Fri, 26 Jul 2013 14:36:58 +0100 Subject: [PATCH 01/13] ADD Module to use email from LDAP records ADD defsult and sugegsted values; auto-install --- users_ldap_mail/__init__.py | 22 +++++++ users_ldap_mail/__openerp__.py | 39 ++++++++++++ users_ldap_mail/i18n/users_ldap_mail.pot | 16 +++++ users_ldap_mail/users_ldap_model.py | 76 ++++++++++++++++++++++++ users_ldap_mail/users_ldap_view.xml | 18 ++++++ 5 files changed, 171 insertions(+) create mode 100644 users_ldap_mail/__init__.py create mode 100644 users_ldap_mail/__openerp__.py create mode 100644 users_ldap_mail/i18n/users_ldap_mail.pot create mode 100644 users_ldap_mail/users_ldap_model.py create mode 100644 users_ldap_mail/users_ldap_view.xml diff --git a/users_ldap_mail/__init__.py b/users_ldap_mail/__init__.py new file mode 100644 index 0000000000..a6d454183f --- /dev/null +++ b/users_ldap_mail/__init__.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# This module copyright (C) 2013 Daniel Reis. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## + +import users_ldap_model diff --git a/users_ldap_mail/__openerp__.py b/users_ldap_mail/__openerp__.py new file mode 100644 index 0000000000..25d3320662 --- /dev/null +++ b/users_ldap_mail/__openerp__.py @@ -0,0 +1,39 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2013 Daniel Reis (https://launchpad.com/~dreis-pt) +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## + +{ + 'name': "LDAP mapping for user name and e-mail", + 'version': "1.0", + 'depends': ["auth_ldap"], + 'author': "Daniel Reis (https://launchpad.com/~dreis-pt)", + 'description': """\ +Allows to define the LDAP attributes to use to retrieve user name and e-mail address. + +The default attribute used for the name is "cn". +For Active Directory, you might prefer to use "displayName" instead. +AD also supports the "mail" attribute, so it can be mapped into OpenERP. +""", + 'category': "Tools", + 'data': [ + 'users_ldap_view.xml', + ], + 'installable': True, +} diff --git a/users_ldap_mail/i18n/users_ldap_mail.pot b/users_ldap_mail/i18n/users_ldap_mail.pot new file mode 100644 index 0000000000..c83ab22af5 --- /dev/null +++ b/users_ldap_mail/i18n/users_ldap_mail.pot @@ -0,0 +1,16 @@ +# Translation of OpenERP Server. +# This file contains the translation of the following modules: +# +msgid "" +msgstr "" +"Project-Id-Version: OpenERP Server 7.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-03-14 17:41+0000\n" +"PO-Revision-Date: 2014-03-14 17:41+0000\n" +"Last-Translator: <>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + diff --git a/users_ldap_mail/users_ldap_model.py b/users_ldap_mail/users_ldap_model.py new file mode 100644 index 0000000000..e4a8bd815b --- /dev/null +++ b/users_ldap_mail/users_ldap_model.py @@ -0,0 +1,76 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# This module copyright (C) 2013 Daniel Reis +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## + +from openerp.osv import fields, orm + +import logging +_log = logging.getLogger(__name__) + + +class CompanyLDAP(orm.Model): + _inherit = 'res.company.ldap' + _columns = { + 'name_attribute': fields.char( + 'Name Attribute', size=64, + help="By default 'cn' is used. " + "For ActiveDirectory you might use 'displayName' instead."), + 'mail_attribute': fields.char( + 'E-mail attribute', size=64, + help="LDAP attribute to use to retrieve em-mail address."), + } + _defaults = { + 'name_attribute': 'cn', + 'mail_attribute': 'mail', + } + + def get_ldap_dicts(self, cr, ids=None): + """ + Copy of auth_ldap's funtion, changing only the SQL, so that it returns + all fields in the table. + """ + if ids: + id_clause = 'AND id IN (%s)' + args = [tuple(ids)] + else: + id_clause = '' + args = [] + cr.execute(""" + SELECT * + FROM res_company_ldap + WHERE ldap_server != '' """ + id_clause + """ ORDER BY sequence + """, args) + return cr.dictfetchall() + + def map_ldap_attributes(self, cr, uid, conf, login, ldap_entry): + values = super(CompanyLDAP, self).map_ldap_attributes(cr, uid, conf, + login, ldap_entry) + mapping = [ + ('name', 'name_attribute'), + ('email', 'mail_attribute'), + ] + for value_key, conf_name in mapping: + try: + if conf[conf_name]: + values[value_key] = ldap_entry[1][conf[conf_name]][0] + except KeyError: + _log.warning('No LDAP attribute "%s" found for login "%s"' % ( + conf.get(conf_name), values.get('login'))) + return values diff --git a/users_ldap_mail/users_ldap_view.xml b/users_ldap_mail/users_ldap_view.xml new file mode 100644 index 0000000000..9395e602f3 --- /dev/null +++ b/users_ldap_mail/users_ldap_view.xml @@ -0,0 +1,18 @@ + + + + + res.company.form.inherit.users_ldap_mail + res.company + + + + + + + + + + + + From 1d663f25728b9e7e2ffb2a88ca6aeb62e95ad8af Mon Sep 17 00:00:00 2001 From: Daniel Reis Date: Tue, 2 Sep 2014 16:16:03 +0100 Subject: [PATCH 02/13] Port users_ldap_mail to v8 Fix PEP8 --- users_ldap_mail/__init__.py | 2 +- users_ldap_mail/__openerp__.py | 9 ++++++--- users_ldap_mail/static/description/icon.png | Bin 0 -> 9455 bytes users_ldap_mail/users_ldap_model.py | 11 ++++++----- 4 files changed, 13 insertions(+), 9 deletions(-) create mode 100644 users_ldap_mail/static/description/icon.png diff --git a/users_ldap_mail/__init__.py b/users_ldap_mail/__init__.py index a6d454183f..1956c281a0 100644 --- a/users_ldap_mail/__init__.py +++ b/users_ldap_mail/__init__.py @@ -19,4 +19,4 @@ # ############################################################################## -import users_ldap_model +from . import users_ldap_model diff --git a/users_ldap_mail/__openerp__.py b/users_ldap_mail/__openerp__.py index 25d3320662..350f05f4a2 100644 --- a/users_ldap_mail/__openerp__.py +++ b/users_ldap_mail/__openerp__.py @@ -21,11 +21,14 @@ { 'name': "LDAP mapping for user name and e-mail", - 'version': "1.0", + 'version': "8.0.1.0.0", 'depends': ["auth_ldap"], - 'author': "Daniel Reis (https://launchpad.com/~dreis-pt)", + 'author': "Daniel Reis (https://launchpad.com/~dreis-pt)," + "Odoo Community Association (OCA)", + 'license': 'AGPL-3', 'description': """\ -Allows to define the LDAP attributes to use to retrieve user name and e-mail address. +Allows to define the LDAP attributes to use to retrieve user name and e-mail +address. The default attribute used for the name is "cn". For Active Directory, you might prefer to use "displayName" instead. diff --git a/users_ldap_mail/static/description/icon.png b/users_ldap_mail/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 diff --git a/users_ldap_mail/users_ldap_model.py b/users_ldap_mail/users_ldap_model.py index e4a8bd815b..731e7c6bb0 100644 --- a/users_ldap_mail/users_ldap_model.py +++ b/users_ldap_mail/users_ldap_model.py @@ -35,11 +35,12 @@ class CompanyLDAP(orm.Model): 'mail_attribute': fields.char( 'E-mail attribute', size=64, help="LDAP attribute to use to retrieve em-mail address."), - } + } + _defaults = { 'name_attribute': 'cn', 'mail_attribute': 'mail', - } + } def get_ldap_dicts(self, cr, ids=None): """ @@ -60,12 +61,12 @@ def get_ldap_dicts(self, cr, ids=None): return cr.dictfetchall() def map_ldap_attributes(self, cr, uid, conf, login, ldap_entry): - values = super(CompanyLDAP, self).map_ldap_attributes(cr, uid, conf, - login, ldap_entry) + values = super(CompanyLDAP, self).map_ldap_attributes( + cr, uid, conf, login, ldap_entry) mapping = [ ('name', 'name_attribute'), ('email', 'mail_attribute'), - ] + ] for value_key, conf_name in mapping: try: if conf[conf_name]: From 500fa4f1a8c20bff42013f2d053bb9ad24b8dfc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul=20=28ACSONE=29?= Date: Sun, 13 Dec 2015 16:11:50 +0100 Subject: [PATCH 03/13] Fix 9.0 version --- users_ldap_mail/__openerp__.py | 2 +- users_ldap_mail/i18n/de.po | 46 +++++++++++++++++++++++++++++++++ users_ldap_mail/i18n/en.po | 45 ++++++++++++++++++++++++++++++++ users_ldap_mail/i18n/es.po | 47 ++++++++++++++++++++++++++++++++++ users_ldap_mail/i18n/fr.po | 45 ++++++++++++++++++++++++++++++++ users_ldap_mail/i18n/hr_HR.po | 46 +++++++++++++++++++++++++++++++++ users_ldap_mail/i18n/pt_BR.po | 46 +++++++++++++++++++++++++++++++++ users_ldap_mail/i18n/sl.po | 46 +++++++++++++++++++++++++++++++++ 8 files changed, 322 insertions(+), 1 deletion(-) create mode 100644 users_ldap_mail/i18n/de.po create mode 100644 users_ldap_mail/i18n/en.po create mode 100644 users_ldap_mail/i18n/es.po create mode 100644 users_ldap_mail/i18n/fr.po create mode 100644 users_ldap_mail/i18n/hr_HR.po create mode 100644 users_ldap_mail/i18n/pt_BR.po create mode 100644 users_ldap_mail/i18n/sl.po diff --git a/users_ldap_mail/__openerp__.py b/users_ldap_mail/__openerp__.py index 350f05f4a2..496c38cc37 100644 --- a/users_ldap_mail/__openerp__.py +++ b/users_ldap_mail/__openerp__.py @@ -21,7 +21,7 @@ { 'name': "LDAP mapping for user name and e-mail", - 'version': "8.0.1.0.0", + 'version': "9.0.1.0.0", 'depends': ["auth_ldap"], 'author': "Daniel Reis (https://launchpad.com/~dreis-pt)," "Odoo Community Association (OCA)", diff --git a/users_ldap_mail/i18n/de.po b/users_ldap_mail/i18n/de.po new file mode 100644 index 0000000000..4938122a98 --- /dev/null +++ b/users_ldap_mail/i18n/de.po @@ -0,0 +1,46 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * users_ldap_mail +# +# Translators: +# Rudolf Schnapka , 2016 +msgid "" +msgstr "" +"Project-Id-Version: server-tools (9.0)\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-04-17 12:15+0000\n" +"PO-Revision-Date: 2016-04-21 09:16+0000\n" +"Last-Translator: Rudolf Schnapka \n" +"Language-Team: German (http://www.transifex.com/oca/OCA-server-tools-9-0/language/de/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: de\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: users_ldap_mail +#: model:ir.model.fields,help:users_ldap_mail.field_res_company_ldap_name_attribute +msgid "" +"By default 'cn' is used. For ActiveDirectory you might use 'displayName' " +"instead." +msgstr "'cn' wird per Vorgabe benutzt. Bei ActiveDirectory können Sie stattdessen 'displayName' verwenden." + +#. module: users_ldap_mail +#: model:ir.model.fields,field_description:users_ldap_mail.field_res_company_ldap_mail_attribute +msgid "E-mail attribute" +msgstr "Email-Attribut" + +#. 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." +msgstr "LDAP-Attribut, um eine Email-Adresse zu erhalten." + +#. module: users_ldap_mail +#: model:ir.model.fields,field_description:users_ldap_mail.field_res_company_ldap_name_attribute +msgid "Name Attribute" +msgstr "Namens-Attribut" + +#. module: users_ldap_mail +#: model:ir.model,name:users_ldap_mail.model_res_company_ldap +msgid "res.company.ldap" +msgstr "res.company.ldap" diff --git a/users_ldap_mail/i18n/en.po b/users_ldap_mail/i18n/en.po new file mode 100644 index 0000000000..bbc0319573 --- /dev/null +++ b/users_ldap_mail/i18n/en.po @@ -0,0 +1,45 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * users_ldap_mail +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: server-tools (9.0)\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-12-15 01:55+0000\n" +"PO-Revision-Date: 2015-12-13 15:21+0000\n" +"Last-Translator: OCA Transbot \n" +"Language-Team: English (http://www.transifex.com/oca/OCA-server-tools-9-0/language/en/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: en\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: users_ldap_mail +#: model:ir.model.fields,help:users_ldap_mail.field_res_company_ldap_name_attribute +msgid "" +"By default 'cn' is used. For ActiveDirectory you might use 'displayName' " +"instead." +msgstr "By default 'cn' is used. For ActiveDirectory you might use 'displayName' instead." + +#. module: users_ldap_mail +#: model:ir.model.fields,field_description:users_ldap_mail.field_res_company_ldap_mail_attribute +msgid "E-mail attribute" +msgstr "E-mail attribute" + +#. 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." +msgstr "LDAP attribute to use to retrieve em-mail address." + +#. module: users_ldap_mail +#: model:ir.model.fields,field_description:users_ldap_mail.field_res_company_ldap_name_attribute +msgid "Name Attribute" +msgstr "Name Attribute" + +#. module: users_ldap_mail +#: model:ir.model,name:users_ldap_mail.model_res_company_ldap +msgid "res.company.ldap" +msgstr "res.company.ldap" diff --git a/users_ldap_mail/i18n/es.po b/users_ldap_mail/i18n/es.po new file mode 100644 index 0000000000..65a20dfa81 --- /dev/null +++ b/users_ldap_mail/i18n/es.po @@ -0,0 +1,47 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * users_ldap_mail +# +# Translators: +# Antonio Trueba, 2016 +# Antonio Trueba, 2016 +msgid "" +msgstr "" +"Project-Id-Version: server-tools (9.0)\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-01-19 14:46+0000\n" +"PO-Revision-Date: 2016-02-16 12:32+0000\n" +"Last-Translator: Antonio Trueba\n" +"Language-Team: Spanish (http://www.transifex.com/oca/OCA-server-tools-9-0/language/es/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: es\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: users_ldap_mail +#: model:ir.model.fields,help:users_ldap_mail.field_res_company_ldap_name_attribute +msgid "" +"By default 'cn' is used. For ActiveDirectory you might use 'displayName' " +"instead." +msgstr "Por defecto se usa «cn». En Directorio Activo se podría usar «displayName» en su lugar." + +#. module: users_ldap_mail +#: model:ir.model.fields,field_description:users_ldap_mail.field_res_company_ldap_mail_attribute +msgid "E-mail attribute" +msgstr "Atributo e-mail" + +#. 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." +msgstr "Atributo LDAP a utilizar para recumerar la dirección em-mail." + +#. module: users_ldap_mail +#: model:ir.model.fields,field_description:users_ldap_mail.field_res_company_ldap_name_attribute +msgid "Name Attribute" +msgstr "Atributo Nombre" + +#. module: users_ldap_mail +#: model:ir.model,name:users_ldap_mail.model_res_company_ldap +msgid "res.company.ldap" +msgstr "res.company.ldap" diff --git a/users_ldap_mail/i18n/fr.po b/users_ldap_mail/i18n/fr.po new file mode 100644 index 0000000000..8b2c5f4c3d --- /dev/null +++ b/users_ldap_mail/i18n/fr.po @@ -0,0 +1,45 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * users_ldap_mail +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: server-tools (9.0)\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-01-19 14:46+0000\n" +"PO-Revision-Date: 2015-12-13 15:21+0000\n" +"Last-Translator: <>\n" +"Language-Team: French (http://www.transifex.com/oca/OCA-server-tools-9-0/language/fr/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: fr\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#. module: users_ldap_mail +#: model:ir.model.fields,help:users_ldap_mail.field_res_company_ldap_name_attribute +msgid "" +"By default 'cn' is used. For ActiveDirectory you might use 'displayName' " +"instead." +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,help:users_ldap_mail.field_res_company_ldap_mail_attribute +msgid "LDAP attribute to use to retrieve em-mail address." +msgstr "" + +#. module: users_ldap_mail +#: model:ir.model.fields,field_description:users_ldap_mail.field_res_company_ldap_name_attribute +msgid "Name Attribute" +msgstr "" + +#. module: users_ldap_mail +#: model:ir.model,name:users_ldap_mail.model_res_company_ldap +msgid "res.company.ldap" +msgstr "res.company.ldap" diff --git a/users_ldap_mail/i18n/hr_HR.po b/users_ldap_mail/i18n/hr_HR.po new file mode 100644 index 0000000000..6bf7fe7aa9 --- /dev/null +++ b/users_ldap_mail/i18n/hr_HR.po @@ -0,0 +1,46 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * users_ldap_mail +# +# Translators: +# Bole , 2016 +msgid "" +msgstr "" +"Project-Id-Version: server-tools (9.0)\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-06-09 12:31+0000\n" +"PO-Revision-Date: 2016-05-31 20:13+0000\n" +"Last-Translator: Bole \n" +"Language-Team: Croatian (Croatia) (http://www.transifex.com/oca/OCA-server-tools-9-0/language/hr_HR/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: hr_HR\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" + +#. module: users_ldap_mail +#: model:ir.model.fields,help:users_ldap_mail.field_res_company_ldap_name_attribute +msgid "" +"By default 'cn' is used. For ActiveDirectory you might use 'displayName' " +"instead." +msgstr "Zadano koristi 'cn'. Za ActiveDirectory možete koristiti i 'displayName'." + +#. module: users_ldap_mail +#: model:ir.model.fields,field_description:users_ldap_mail.field_res_company_ldap_mail_attribute +msgid "E-mail attribute" +msgstr "E-mail atribut" + +#. 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." +msgstr "LDAP atribut za dohvaćanje e-mail adrese." + +#. module: users_ldap_mail +#: model:ir.model.fields,field_description:users_ldap_mail.field_res_company_ldap_name_attribute +msgid "Name Attribute" +msgstr "Atribut Naziv" + +#. module: users_ldap_mail +#: model:ir.model,name:users_ldap_mail.model_res_company_ldap +msgid "res.company.ldap" +msgstr "res.company.ldap" diff --git a/users_ldap_mail/i18n/pt_BR.po b/users_ldap_mail/i18n/pt_BR.po new file mode 100644 index 0000000000..ace20535f1 --- /dev/null +++ b/users_ldap_mail/i18n/pt_BR.po @@ -0,0 +1,46 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * users_ldap_mail +# +# Translators: +# Armando Vulcano Junior , 2015 +msgid "" +msgstr "" +"Project-Id-Version: server-tools (9.0)\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-12-15 01:55+0000\n" +"PO-Revision-Date: 2015-12-13 15:21+0000\n" +"Last-Translator: OCA Transbot \n" +"Language-Team: Portuguese (Brazil) (http://www.transifex.com/oca/OCA-server-tools-9-0/language/pt_BR/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: pt_BR\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#. module: users_ldap_mail +#: model:ir.model.fields,help:users_ldap_mail.field_res_company_ldap_name_attribute +msgid "" +"By default 'cn' is used. For ActiveDirectory you might use 'displayName' " +"instead." +msgstr "Por padrão 'cn' é usado. Para ActiveDirectory você pode usar 'displayName'" + +#. module: users_ldap_mail +#: model:ir.model.fields,field_description:users_ldap_mail.field_res_company_ldap_mail_attribute +msgid "E-mail attribute" +msgstr "Atributo E-mail" + +#. 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." +msgstr "Use o atributo LDAP para recuperar o endereço de e-mail" + +#. module: users_ldap_mail +#: model:ir.model.fields,field_description:users_ldap_mail.field_res_company_ldap_name_attribute +msgid "Name Attribute" +msgstr "Atributo Nome" + +#. module: users_ldap_mail +#: model:ir.model,name:users_ldap_mail.model_res_company_ldap +msgid "res.company.ldap" +msgstr "" diff --git a/users_ldap_mail/i18n/sl.po b/users_ldap_mail/i18n/sl.po new file mode 100644 index 0000000000..04d9bb081a --- /dev/null +++ b/users_ldap_mail/i18n/sl.po @@ -0,0 +1,46 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * users_ldap_mail +# +# Translators: +# Matjaž Mozetič , 2015 +msgid "" +msgstr "" +"Project-Id-Version: server-tools (9.0)\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-12-15 01:55+0000\n" +"PO-Revision-Date: 2015-12-14 06:46+0000\n" +"Last-Translator: Matjaž Mozetič \n" +"Language-Team: Slovenian (http://www.transifex.com/oca/OCA-server-tools-9-0/language/sl/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: sl\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" + +#. module: users_ldap_mail +#: model:ir.model.fields,help:users_ldap_mail.field_res_company_ldap_name_attribute +msgid "" +"By default 'cn' is used. For ActiveDirectory you might use 'displayName' " +"instead." +msgstr "Privzeto se uporablja 'cn'. Za aktivni imenik bi lahko namesto tega uporabili 'displayName'." + +#. module: users_ldap_mail +#: model:ir.model.fields,field_description:users_ldap_mail.field_res_company_ldap_mail_attribute +msgid "E-mail attribute" +msgstr "E-poštni atribut" + +#. 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." +msgstr "LDAP atribut za uporabo pri pridobivanju e-poštnih naslovov." + +#. module: users_ldap_mail +#: model:ir.model.fields,field_description:users_ldap_mail.field_res_company_ldap_name_attribute +msgid "Name Attribute" +msgstr "Naziv atributa" + +#. module: users_ldap_mail +#: model:ir.model,name:users_ldap_mail.model_res_company_ldap +msgid "res.company.ldap" +msgstr "res.company.ldap" From 54a3ee3ab574ca441b5c27bc7ab0f1d1c5493a1f Mon Sep 17 00:00:00 2001 From: Stephan Date: Tue, 27 Dec 2016 23:12:37 +0100 Subject: [PATCH 04/13] 10.0 Migrate users_ldap_mail module (#651) * [ADD] Add README.rst to users_ldap_mail * [MIG] Migrate users_ldap_mail to 10.0 * [FIX] Fixes in code style in module users_ldap_mail Changes in models/users_ldap_mail include: - remove unused imports - indentation of too long lines * [FIX] users_ldap_mail: Fix copyright notice * [FIX] users_ldap_mail: set UTF-8 encoding users_ldap_mail/models/__init__.py should be UTF-8 encoded * [FIX] users_ldap_mail: remove size argument from Char fields * [FIX] users_ldap_mail: return value can be combined in one line * [FIX] Update read me Fixes included: - Make module name human readable - Instead of numbering steps, use # - Update broken link --- users_ldap_mail/README.rst | 67 +++++++++++++++++++ users_ldap_mail/__init__.py | 24 ++----- users_ldap_mail/__manifest__.py | 25 +++++++ users_ldap_mail/__openerp__.py | 42 ------------ users_ldap_mail/i18n/hr.po | 49 ++++++++++++++ users_ldap_mail/i18n/zh_CN.po | 46 +++++++++++++ users_ldap_mail/models/__init__.py | 6 ++ users_ldap_mail/models/users_ldap_model.py | 44 +++++++++++++ users_ldap_mail/users_ldap_model.py | 77 ---------------------- users_ldap_mail/users_ldap_view.xml | 18 ----- users_ldap_mail/views/users_ldap_view.xml | 14 ++++ 11 files changed, 255 insertions(+), 157 deletions(-) create mode 100644 users_ldap_mail/README.rst create mode 100644 users_ldap_mail/__manifest__.py delete mode 100644 users_ldap_mail/__openerp__.py create mode 100644 users_ldap_mail/i18n/hr.po create mode 100644 users_ldap_mail/i18n/zh_CN.po create mode 100644 users_ldap_mail/models/__init__.py create mode 100644 users_ldap_mail/models/users_ldap_model.py delete mode 100644 users_ldap_mail/users_ldap_model.py delete mode 100644 users_ldap_mail/users_ldap_view.xml create mode 100644 users_ldap_mail/views/users_ldap_view.xml diff --git a/users_ldap_mail/README.rst b/users_ldap_mail/README.rst new file mode 100644 index 0000000000..1c1819275b --- /dev/null +++ b/users_ldap_mail/README.rst @@ -0,0 +1,67 @@ +.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 + +=============== +Users LDAP Mail +=============== + +This module extends the functionality of the auth_ldap module to support mail +from LDAP and to allow you to get an e-mail address from LDAP accounts to Odoo +users. + +Usage +===== + +To use this module, you need to: + +#. Open Odoo in your browser +#. Go to Settings +#. Go to General Settings +#. In The General Settings form go to LDAP Parameters +#. In a LDAP Parameters item there are two new fields: mail and name, the name + These items will correspond with a new user that is created, when a user + logs in via LDAP in Odoo. + +.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas + :alt: Try me on Runbot + :target: https://runbot.odoo-community.org/runbot/repo/149 + +.. repo_id is available in https://github.com/OCA/maintainer-tools/blob/master/tools/repos_with_ids.txt +.. branch is "8.0" for example + +Bug Tracker +=========== + +Bugs are tracked on `GitHub Issues +`_. In case of trouble, please +check there if your issue has already been reported. If you spotted it first, +help us smashing it by providing a detailed and welcomed feedback. + +Credits +======= + +Images +------ + +* Odoo Community Association: `Icon `_. + +Contributors +------------ + +* Daniel Reis (https://launchpad.com/~dreis-pt), + +Maintainer +---------- + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +This module is maintained by the OCA. + +OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use. + +To contribute to this module, please visit https://odoo-community.org. diff --git a/users_ldap_mail/__init__.py b/users_ldap_mail/__init__.py index 1956c281a0..a0bd913cdc 100644 --- a/users_ldap_mail/__init__.py +++ b/users_ldap_mail/__init__.py @@ -1,22 +1,6 @@ # -*- coding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Management Solution -# This module copyright (C) 2013 Daniel Reis. -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## +# © Daniel Reis (https://launchpad.com/~dreis-pt) +# License AGPL-3.0 or later (http://www.gnu.org/licenses/gpl.html). + +from . import models -from . import users_ldap_model diff --git a/users_ldap_mail/__manifest__.py b/users_ldap_mail/__manifest__.py new file mode 100644 index 0000000000..ffcd4daf33 --- /dev/null +++ b/users_ldap_mail/__manifest__.py @@ -0,0 +1,25 @@ +# -*- coding: utf-8 -*- +# © Daniel Reis (https://launchpad.com/~dreis-pt) +# License AGPL-3.0 or later (http://www.gnu.org/licenses/gpl.html). + +{ + 'name': "LDAP mapping for user name and e-mail", + 'version': "10.0.1.0.0", + 'depends': ["auth_ldap"], + 'author': "Daniel Reis (https://launchpad.com/~dreis-pt)," + "Odoo Community Association (OCA)", + 'license': 'AGPL-3', + 'description': """\ +Allows to define the LDAP attributes to use to retrieve user name and e-mail +address. + +The default attribute used for the name is "cn". +For Active Directory, you might prefer to use "displayName" instead. +AD also supports the "mail" attribute, so it can be mapped into OpenERP. +""", + 'category': "Tools", + 'data': [ + 'views/users_ldap_view.xml', + ], + 'installable': True, +} diff --git a/users_ldap_mail/__openerp__.py b/users_ldap_mail/__openerp__.py deleted file mode 100644 index 496c38cc37..0000000000 --- a/users_ldap_mail/__openerp__.py +++ /dev/null @@ -1,42 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Management Solution -# Copyright (C) 2013 Daniel Reis (https://launchpad.com/~dreis-pt) -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## - -{ - 'name': "LDAP mapping for user name and e-mail", - 'version': "9.0.1.0.0", - 'depends': ["auth_ldap"], - 'author': "Daniel Reis (https://launchpad.com/~dreis-pt)," - "Odoo Community Association (OCA)", - 'license': 'AGPL-3', - 'description': """\ -Allows to define the LDAP attributes to use to retrieve user name and e-mail -address. - -The default attribute used for the name is "cn". -For Active Directory, you might prefer to use "displayName" instead. -AD also supports the "mail" attribute, so it can be mapped into OpenERP. -""", - 'category': "Tools", - 'data': [ - 'users_ldap_view.xml', - ], - 'installable': True, -} diff --git a/users_ldap_mail/i18n/hr.po b/users_ldap_mail/i18n/hr.po new file mode 100644 index 0000000000..ad52be2a2b --- /dev/null +++ b/users_ldap_mail/i18n/hr.po @@ -0,0 +1,49 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * users_ldap_mail +# +# Translators: +# OCA Transbot , 2017 +# Bole , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-05-10 00:47+0000\n" +"PO-Revision-Date: 2017-05-10 00:47+0000\n" +"Last-Translator: Bole , 2017\n" +"Language-Team: Croatian (https://www.transifex.com/oca/teams/23907/hr/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: hr\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" + +#. module: users_ldap_mail +#: model:ir.model.fields,help:users_ldap_mail.field_res_company_ldap_name_attribute +msgid "" +"By default 'cn' is used. For ActiveDirectory you might use 'displayName' " +"instead." +msgstr "" +"Zadano se koristi 'CN'. za ActiveDirectory možete koristiti 'displayName' " +"umjesto zadanog." + +#. module: users_ldap_mail +#: model:ir.model.fields,field_description:users_ldap_mail.field_res_company_ldap_mail_attribute +msgid "E-mail attribute" +msgstr "Atribut e-mail" + +#. 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." +msgstr "LDAP atribut za dohvat email adresa." + +#. module: users_ldap_mail +#: model:ir.model.fields,field_description:users_ldap_mail.field_res_company_ldap_name_attribute +msgid "Name Attribute" +msgstr "Atribut naziva" + +#. module: users_ldap_mail +#: model:ir.model,name:users_ldap_mail.model_res_company_ldap +msgid "res.company.ldap" +msgstr "res.company.ldap" diff --git a/users_ldap_mail/i18n/zh_CN.po b/users_ldap_mail/i18n/zh_CN.po new file mode 100644 index 0000000000..df0d6174df --- /dev/null +++ b/users_ldap_mail/i18n/zh_CN.po @@ -0,0 +1,46 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * users_ldap_mail +# +# Translators: +# Jeffery Chenn , 2016 +msgid "" +msgstr "" +"Project-Id-Version: server-tools (9.0)\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-08-31 11:58+0000\n" +"PO-Revision-Date: 2016-09-04 06:11+0000\n" +"Last-Translator: Jeffery Chenn \n" +"Language-Team: Chinese (China) (http://www.transifex.com/oca/OCA-server-tools-9-0/language/zh_CN/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: zh_CN\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#. module: users_ldap_mail +#: model:ir.model.fields,help:users_ldap_mail.field_res_company_ldap_name_attribute +msgid "" +"By default 'cn' is used. For ActiveDirectory you might use 'displayName' " +"instead." +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 "E-mail 属性" + +#. 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." +msgstr "" + +#. module: users_ldap_mail +#: model:ir.model.fields,field_description:users_ldap_mail.field_res_company_ldap_name_attribute +msgid "Name Attribute" +msgstr "名称属性" + +#. module: users_ldap_mail +#: model:ir.model,name:users_ldap_mail.model_res_company_ldap +msgid "res.company.ldap" +msgstr "" diff --git a/users_ldap_mail/models/__init__.py b/users_ldap_mail/models/__init__.py new file mode 100644 index 0000000000..22a4466178 --- /dev/null +++ b/users_ldap_mail/models/__init__.py @@ -0,0 +1,6 @@ +# -*- coding: utf-8 -*- +# © Daniel Reis (https://launchpad.com/~dreis-pt) +# License AGPL-3.0 or later (http://www.gnu.org/licenses/gpl.html). + +from . import users_ldap_model + diff --git a/users_ldap_mail/models/users_ldap_model.py b/users_ldap_mail/models/users_ldap_model.py new file mode 100644 index 0000000000..1d625a3dc1 --- /dev/null +++ b/users_ldap_mail/models/users_ldap_model.py @@ -0,0 +1,44 @@ +# -*- coding: utf-8 -*- +# © Daniel Reis (https://launchpad.com/~dreis-pt) +# License AGPL-3.0 or later (http://www.gnu.org/licenses/gpl.html). + +from odoo import models, fields + +import logging +_log = logging.getLogger(__name__) + + +class CompanyLDAP(models.Model): + _inherit = 'res.company.ldap' + + name_attribute = fields.Char( + 'Name Attribute', _defaults='cn', + help="By default 'cn' is used. " + "For ActiveDirectory you might use 'displayName' instead.") + mail_attribute = fields.Char( + 'E-mail attribute', _defaults='mail', + help="LDAP attribute to use to retrieve em-mail address.") + + def get_ldap_dicts(self): + """ + Copy of auth_ldap's funtion, changing only the SQL, so that it returns + all fields in the table. + """ + return self.sudo().search([('ldap_server', '!=', False)], + order='sequence').read([]) + + def map_ldap_attributes(self, conf, login, ldap_entry): + values = super(CompanyLDAP, self).map_ldap_attributes(conf, login, + ldap_entry) + mapping = [ + ('name', 'name_attribute'), + ('email', 'mail_attribute'), + ] + for value_key, conf_name in mapping: + try: + if conf[conf_name]: + values[value_key] = ldap_entry[1][conf[conf_name]][0] + except KeyError: + _log.warning('No LDAP attribute "%s" found for login "%s"' % ( + conf.get(conf_name), values.get('login'))) + return values diff --git a/users_ldap_mail/users_ldap_model.py b/users_ldap_mail/users_ldap_model.py deleted file mode 100644 index 731e7c6bb0..0000000000 --- a/users_ldap_mail/users_ldap_model.py +++ /dev/null @@ -1,77 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Management Solution -# This module copyright (C) 2013 Daniel Reis -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## - -from openerp.osv import fields, orm - -import logging -_log = logging.getLogger(__name__) - - -class CompanyLDAP(orm.Model): - _inherit = 'res.company.ldap' - _columns = { - 'name_attribute': fields.char( - 'Name Attribute', size=64, - help="By default 'cn' is used. " - "For ActiveDirectory you might use 'displayName' instead."), - 'mail_attribute': fields.char( - 'E-mail attribute', size=64, - help="LDAP attribute to use to retrieve em-mail address."), - } - - _defaults = { - 'name_attribute': 'cn', - 'mail_attribute': 'mail', - } - - def get_ldap_dicts(self, cr, ids=None): - """ - Copy of auth_ldap's funtion, changing only the SQL, so that it returns - all fields in the table. - """ - if ids: - id_clause = 'AND id IN (%s)' - args = [tuple(ids)] - else: - id_clause = '' - args = [] - cr.execute(""" - SELECT * - FROM res_company_ldap - WHERE ldap_server != '' """ + id_clause + """ ORDER BY sequence - """, args) - return cr.dictfetchall() - - def map_ldap_attributes(self, cr, uid, conf, login, ldap_entry): - values = super(CompanyLDAP, self).map_ldap_attributes( - cr, uid, conf, login, ldap_entry) - mapping = [ - ('name', 'name_attribute'), - ('email', 'mail_attribute'), - ] - for value_key, conf_name in mapping: - try: - if conf[conf_name]: - values[value_key] = ldap_entry[1][conf[conf_name]][0] - except KeyError: - _log.warning('No LDAP attribute "%s" found for login "%s"' % ( - conf.get(conf_name), values.get('login'))) - return values diff --git a/users_ldap_mail/users_ldap_view.xml b/users_ldap_mail/users_ldap_view.xml deleted file mode 100644 index 9395e602f3..0000000000 --- a/users_ldap_mail/users_ldap_view.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - res.company.form.inherit.users_ldap_mail - res.company - - - - - - - - - - - - diff --git a/users_ldap_mail/views/users_ldap_view.xml b/users_ldap_mail/views/users_ldap_view.xml new file mode 100644 index 0000000000..44fc9b7337 --- /dev/null +++ b/users_ldap_mail/views/users_ldap_view.xml @@ -0,0 +1,14 @@ + + + + Add name and email attributes to ldap view + base.config.settings + + + + + + + + + From 9f405085677c639cbcef65a319484d674c2fc997 Mon Sep 17 00:00:00 2001 From: Enric Tobella Date: Mon, 9 Oct 2017 15:14:49 +0200 Subject: [PATCH 05/13] [MIG] users_ldap_mail --- users_ldap_mail/README.rst | 2 +- users_ldap_mail/__init__.py | 1 - users_ldap_mail/__manifest__.py | 15 +++------------ users_ldap_mail/i18n/users_ldap_mail.pot | 16 ---------------- users_ldap_mail/models/__init__.py | 1 - users_ldap_mail/models/users_ldap_model.py | 1 - users_ldap_mail/views/res_company_ldap.xml | 15 +++++++++++++++ users_ldap_mail/views/users_ldap_view.xml | 14 -------------- 8 files changed, 19 insertions(+), 46 deletions(-) delete mode 100644 users_ldap_mail/i18n/users_ldap_mail.pot create mode 100644 users_ldap_mail/views/res_company_ldap.xml delete mode 100644 users_ldap_mail/views/users_ldap_view.xml diff --git a/users_ldap_mail/README.rst b/users_ldap_mail/README.rst index 1c1819275b..2f4c8d27b9 100644 --- a/users_ldap_mail/README.rst +++ b/users_ldap_mail/README.rst @@ -1,5 +1,5 @@ .. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg - :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :target: https://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 =============== diff --git a/users_ldap_mail/__init__.py b/users_ldap_mail/__init__.py index a0bd913cdc..d75858919a 100644 --- a/users_ldap_mail/__init__.py +++ b/users_ldap_mail/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # © Daniel Reis (https://launchpad.com/~dreis-pt) # License AGPL-3.0 or later (http://www.gnu.org/licenses/gpl.html). diff --git a/users_ldap_mail/__manifest__.py b/users_ldap_mail/__manifest__.py index ffcd4daf33..d9db65419f 100644 --- a/users_ldap_mail/__manifest__.py +++ b/users_ldap_mail/__manifest__.py @@ -1,25 +1,16 @@ -# -*- coding: utf-8 -*- # © Daniel Reis (https://launchpad.com/~dreis-pt) # License AGPL-3.0 or later (http://www.gnu.org/licenses/gpl.html). { 'name': "LDAP mapping for user name and e-mail", - 'version': "10.0.1.0.0", + 'version': "11.0.1.0.0", 'depends': ["auth_ldap"], - 'author': "Daniel Reis (https://launchpad.com/~dreis-pt)," + 'author': "Daniel Reis," "Odoo Community Association (OCA)", 'license': 'AGPL-3', - 'description': """\ -Allows to define the LDAP attributes to use to retrieve user name and e-mail -address. - -The default attribute used for the name is "cn". -For Active Directory, you might prefer to use "displayName" instead. -AD also supports the "mail" attribute, so it can be mapped into OpenERP. -""", 'category': "Tools", 'data': [ - 'views/users_ldap_view.xml', + 'views/res_company_ldap.xml', ], 'installable': True, } diff --git a/users_ldap_mail/i18n/users_ldap_mail.pot b/users_ldap_mail/i18n/users_ldap_mail.pot deleted file mode 100644 index c83ab22af5..0000000000 --- a/users_ldap_mail/i18n/users_ldap_mail.pot +++ /dev/null @@ -1,16 +0,0 @@ -# Translation of OpenERP Server. -# This file contains the translation of the following modules: -# -msgid "" -msgstr "" -"Project-Id-Version: OpenERP Server 7.0\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-03-14 17:41+0000\n" -"PO-Revision-Date: 2014-03-14 17:41+0000\n" -"Last-Translator: <>\n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Plural-Forms: \n" - diff --git a/users_ldap_mail/models/__init__.py b/users_ldap_mail/models/__init__.py index 22a4466178..42c6293ea9 100644 --- a/users_ldap_mail/models/__init__.py +++ b/users_ldap_mail/models/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # © Daniel Reis (https://launchpad.com/~dreis-pt) # License AGPL-3.0 or later (http://www.gnu.org/licenses/gpl.html). diff --git a/users_ldap_mail/models/users_ldap_model.py b/users_ldap_mail/models/users_ldap_model.py index 1d625a3dc1..a319ea183f 100644 --- a/users_ldap_mail/models/users_ldap_model.py +++ b/users_ldap_mail/models/users_ldap_model.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # © Daniel Reis (https://launchpad.com/~dreis-pt) # License AGPL-3.0 or later (http://www.gnu.org/licenses/gpl.html). diff --git a/users_ldap_mail/views/res_company_ldap.xml b/users_ldap_mail/views/res_company_ldap.xml new file mode 100644 index 0000000000..ec9f7d89c9 --- /dev/null +++ b/users_ldap_mail/views/res_company_ldap.xml @@ -0,0 +1,15 @@ + + + + res.company.ldap.form + res.company.ldap + + + + + + + + + diff --git a/users_ldap_mail/views/users_ldap_view.xml b/users_ldap_mail/views/users_ldap_view.xml deleted file mode 100644 index 44fc9b7337..0000000000 --- a/users_ldap_mail/views/users_ldap_view.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - Add name and email attributes to ldap view - base.config.settings - - - - - - - - - From 3f9bc99b6bb5042ef1b4d70ecc49ad2a166b60d5 Mon Sep 17 00:00:00 2001 From: Artem Kostyuk Date: Thu, 25 Oct 2018 13:53:31 +0300 Subject: [PATCH 06/13] [10.0][FIX] users_ldap_mail: Provide defaults to attributes properly Forward-port https://github.com/OCA/server-tools/pull/1405. --- users_ldap_mail/i18n/de.po | 11 +++--- users_ldap_mail/i18n/es.po | 11 +++--- users_ldap_mail/i18n/fr.po | 7 ++-- users_ldap_mail/i18n/hr.po | 7 ++-- users_ldap_mail/i18n/hr_HR.po | 13 ++++--- users_ldap_mail/i18n/pt_BR.po | 10 +++--- users_ldap_mail/i18n/sl.po | 14 +++++--- users_ldap_mail/i18n/users_ldap_mail.pot | 40 ++++++++++++++++++++++ users_ldap_mail/i18n/zh_CN.po | 7 ++-- users_ldap_mail/models/users_ldap_model.py | 12 ++++--- 10 files changed, 97 insertions(+), 35 deletions(-) create mode 100644 users_ldap_mail/i18n/users_ldap_mail.pot diff --git a/users_ldap_mail/i18n/de.po b/users_ldap_mail/i18n/de.po index 4938122a98..c7e0297717 100644 --- a/users_ldap_mail/i18n/de.po +++ b/users_ldap_mail/i18n/de.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * users_ldap_mail -# +# # Translators: # Rudolf Schnapka , 2016 msgid "" @@ -11,11 +11,12 @@ msgstr "" "POT-Creation-Date: 2016-04-17 12:15+0000\n" "PO-Revision-Date: 2016-04-21 09:16+0000\n" "Last-Translator: Rudolf Schnapka \n" -"Language-Team: German (http://www.transifex.com/oca/OCA-server-tools-9-0/language/de/)\n" +"Language-Team: German (http://www.transifex.com/oca/OCA-server-tools-9-0/" +"language/de/)\n" +"Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: users_ldap_mail @@ -23,7 +24,9 @@ msgstr "" msgid "" "By default 'cn' is used. For ActiveDirectory you might use 'displayName' " "instead." -msgstr "'cn' wird per Vorgabe benutzt. Bei ActiveDirectory können Sie stattdessen 'displayName' verwenden." +msgstr "" +"'cn' wird per Vorgabe benutzt. Bei ActiveDirectory können Sie stattdessen " +"'displayName' verwenden." #. module: users_ldap_mail #: model:ir.model.fields,field_description:users_ldap_mail.field_res_company_ldap_mail_attribute diff --git a/users_ldap_mail/i18n/es.po b/users_ldap_mail/i18n/es.po index 65a20dfa81..64583845d8 100644 --- a/users_ldap_mail/i18n/es.po +++ b/users_ldap_mail/i18n/es.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * users_ldap_mail -# +# # Translators: # Antonio Trueba, 2016 # Antonio Trueba, 2016 @@ -12,11 +12,12 @@ msgstr "" "POT-Creation-Date: 2016-01-19 14:46+0000\n" "PO-Revision-Date: 2016-02-16 12:32+0000\n" "Last-Translator: Antonio Trueba\n" -"Language-Team: Spanish (http://www.transifex.com/oca/OCA-server-tools-9-0/language/es/)\n" +"Language-Team: Spanish (http://www.transifex.com/oca/OCA-server-tools-9-0/" +"language/es/)\n" +"Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: users_ldap_mail @@ -24,7 +25,9 @@ msgstr "" msgid "" "By default 'cn' is used. For ActiveDirectory you might use 'displayName' " "instead." -msgstr "Por defecto se usa «cn». En Directorio Activo se podría usar «displayName» en su lugar." +msgstr "" +"Por defecto se usa «cn». En Directorio Activo se podría usar «displayName» " +"en su lugar." #. module: users_ldap_mail #: model:ir.model.fields,field_description:users_ldap_mail.field_res_company_ldap_mail_attribute diff --git a/users_ldap_mail/i18n/fr.po b/users_ldap_mail/i18n/fr.po index 8b2c5f4c3d..ac43b824c4 100644 --- a/users_ldap_mail/i18n/fr.po +++ b/users_ldap_mail/i18n/fr.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * users_ldap_mail -# +# # Translators: msgid "" msgstr "" @@ -10,11 +10,12 @@ msgstr "" "POT-Creation-Date: 2016-01-19 14:46+0000\n" "PO-Revision-Date: 2015-12-13 15:21+0000\n" "Last-Translator: <>\n" -"Language-Team: French (http://www.transifex.com/oca/OCA-server-tools-9-0/language/fr/)\n" +"Language-Team: French (http://www.transifex.com/oca/OCA-server-tools-9-0/" +"language/fr/)\n" +"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #. module: users_ldap_mail diff --git a/users_ldap_mail/i18n/hr.po b/users_ldap_mail/i18n/hr.po index ad52be2a2b..38c53685db 100644 --- a/users_ldap_mail/i18n/hr.po +++ b/users_ldap_mail/i18n/hr.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * users_ldap_mail -# +# # Translators: # OCA Transbot , 2017 # Bole , 2017 @@ -13,11 +13,12 @@ msgstr "" "PO-Revision-Date: 2017-05-10 00:47+0000\n" "Last-Translator: Bole , 2017\n" "Language-Team: Croatian (https://www.transifex.com/oca/teams/23907/hr/)\n" +"Language: hr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: hr\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" #. module: users_ldap_mail #: model:ir.model.fields,help:users_ldap_mail.field_res_company_ldap_name_attribute diff --git a/users_ldap_mail/i18n/hr_HR.po b/users_ldap_mail/i18n/hr_HR.po index 6bf7fe7aa9..d3509508d3 100644 --- a/users_ldap_mail/i18n/hr_HR.po +++ b/users_ldap_mail/i18n/hr_HR.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * users_ldap_mail -# +# # Translators: # Bole , 2016 msgid "" @@ -11,19 +11,22 @@ msgstr "" "POT-Creation-Date: 2016-06-09 12:31+0000\n" "PO-Revision-Date: 2016-05-31 20:13+0000\n" "Last-Translator: Bole \n" -"Language-Team: Croatian (Croatia) (http://www.transifex.com/oca/OCA-server-tools-9-0/language/hr_HR/)\n" +"Language-Team: Croatian (Croatia) (http://www.transifex.com/oca/OCA-server-" +"tools-9-0/language/hr_HR/)\n" +"Language: hr_HR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: hr_HR\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" #. module: users_ldap_mail #: model:ir.model.fields,help:users_ldap_mail.field_res_company_ldap_name_attribute msgid "" "By default 'cn' is used. For ActiveDirectory you might use 'displayName' " "instead." -msgstr "Zadano koristi 'cn'. Za ActiveDirectory možete koristiti i 'displayName'." +msgstr "" +"Zadano koristi 'cn'. Za ActiveDirectory možete koristiti i 'displayName'." #. module: users_ldap_mail #: model:ir.model.fields,field_description:users_ldap_mail.field_res_company_ldap_mail_attribute diff --git a/users_ldap_mail/i18n/pt_BR.po b/users_ldap_mail/i18n/pt_BR.po index ace20535f1..5fc2b6d9ac 100644 --- a/users_ldap_mail/i18n/pt_BR.po +++ b/users_ldap_mail/i18n/pt_BR.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * users_ldap_mail -# +# # Translators: # Armando Vulcano Junior , 2015 msgid "" @@ -11,11 +11,12 @@ msgstr "" "POT-Creation-Date: 2015-12-15 01:55+0000\n" "PO-Revision-Date: 2015-12-13 15:21+0000\n" "Last-Translator: OCA Transbot \n" -"Language-Team: Portuguese (Brazil) (http://www.transifex.com/oca/OCA-server-tools-9-0/language/pt_BR/)\n" +"Language-Team: Portuguese (Brazil) (http://www.transifex.com/oca/OCA-server-" +"tools-9-0/language/pt_BR/)\n" +"Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: pt_BR\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #. module: users_ldap_mail @@ -23,7 +24,8 @@ msgstr "" msgid "" "By default 'cn' is used. For ActiveDirectory you might use 'displayName' " "instead." -msgstr "Por padrão 'cn' é usado. Para ActiveDirectory você pode usar 'displayName'" +msgstr "" +"Por padrão 'cn' é usado. Para ActiveDirectory você pode usar 'displayName'" #. module: users_ldap_mail #: model:ir.model.fields,field_description:users_ldap_mail.field_res_company_ldap_mail_attribute diff --git a/users_ldap_mail/i18n/sl.po b/users_ldap_mail/i18n/sl.po index 04d9bb081a..3092037bb4 100644 --- a/users_ldap_mail/i18n/sl.po +++ b/users_ldap_mail/i18n/sl.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * users_ldap_mail -# +# # Translators: # Matjaž Mozetič , 2015 msgid "" @@ -11,19 +11,23 @@ msgstr "" "POT-Creation-Date: 2015-12-15 01:55+0000\n" "PO-Revision-Date: 2015-12-14 06:46+0000\n" "Last-Translator: Matjaž Mozetič \n" -"Language-Team: Slovenian (http://www.transifex.com/oca/OCA-server-tools-9-0/language/sl/)\n" +"Language-Team: Slovenian (http://www.transifex.com/oca/OCA-server-tools-9-0/" +"language/sl/)\n" +"Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: sl\n" -"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n" +"%100==4 ? 2 : 3);\n" #. module: users_ldap_mail #: model:ir.model.fields,help:users_ldap_mail.field_res_company_ldap_name_attribute msgid "" "By default 'cn' is used. For ActiveDirectory you might use 'displayName' " "instead." -msgstr "Privzeto se uporablja 'cn'. Za aktivni imenik bi lahko namesto tega uporabili 'displayName'." +msgstr "" +"Privzeto se uporablja 'cn'. Za aktivni imenik bi lahko namesto tega " +"uporabili 'displayName'." #. module: users_ldap_mail #: model:ir.model.fields,field_description:users_ldap_mail.field_res_company_ldap_mail_attribute diff --git a/users_ldap_mail/i18n/users_ldap_mail.pot b/users_ldap_mail/i18n/users_ldap_mail.pot new file mode 100644 index 0000000000..c578c91f4d --- /dev/null +++ b/users_ldap_mail/i18n/users_ldap_mail.pot @@ -0,0 +1,40 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * users_ldap_mail +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 11.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: <>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: users_ldap_mail +#: model:ir.model.fields,help:users_ldap_mail.field_res_company_ldap_name_attribute +msgid "By default 'cn' is used. For ActiveDirectory you might use 'displayName' instead." +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,help:users_ldap_mail.field_res_company_ldap_mail_attribute +msgid "LDAP attribute to use to retrieve em-mail address." +msgstr "" + +#. module: users_ldap_mail +#: model:ir.model.fields,field_description:users_ldap_mail.field_res_company_ldap_name_attribute +msgid "Name Attribute" +msgstr "" + +#. module: users_ldap_mail +#: model:ir.model,name:users_ldap_mail.model_res_company_ldap +msgid "res.company.ldap" +msgstr "" + diff --git a/users_ldap_mail/i18n/zh_CN.po b/users_ldap_mail/i18n/zh_CN.po index df0d6174df..f217c1462d 100644 --- a/users_ldap_mail/i18n/zh_CN.po +++ b/users_ldap_mail/i18n/zh_CN.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * users_ldap_mail -# +# # Translators: # Jeffery Chenn , 2016 msgid "" @@ -11,11 +11,12 @@ msgstr "" "POT-Creation-Date: 2016-08-31 11:58+0000\n" "PO-Revision-Date: 2016-09-04 06:11+0000\n" "Last-Translator: Jeffery Chenn \n" -"Language-Team: Chinese (China) (http://www.transifex.com/oca/OCA-server-tools-9-0/language/zh_CN/)\n" +"Language-Team: Chinese (China) (http://www.transifex.com/oca/OCA-server-" +"tools-9-0/language/zh_CN/)\n" +"Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: zh_CN\n" "Plural-Forms: nplurals=1; plural=0;\n" #. module: users_ldap_mail diff --git a/users_ldap_mail/models/users_ldap_model.py b/users_ldap_mail/models/users_ldap_model.py index a319ea183f..77f4a2d705 100644 --- a/users_ldap_mail/models/users_ldap_model.py +++ b/users_ldap_mail/models/users_ldap_model.py @@ -11,12 +11,16 @@ class CompanyLDAP(models.Model): _inherit = 'res.company.ldap' name_attribute = fields.Char( - 'Name Attribute', _defaults='cn', + 'Name Attribute', + default='cn', help="By default 'cn' is used. " - "For ActiveDirectory you might use 'displayName' instead.") + "For ActiveDirectory you might use 'displayName' instead.", + ) mail_attribute = fields.Char( - 'E-mail attribute', _defaults='mail', - help="LDAP attribute to use to retrieve em-mail address.") + 'E-mail attribute', + default='mail', + help="LDAP attribute to use to retrieve em-mail address.", + ) def get_ldap_dicts(self): """ From 484bd02fd723edd4ed3d41c0bc158672290b7227 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexandre=20D=C3=ADaz?= Date: Wed, 18 Dec 2019 14:42:41 +0100 Subject: [PATCH 07/13] [MIG] users_ldap_mail: Migration to 12.0 --- users_ldap_mail/README.rst | 78 ++-- users_ldap_mail/__init__.py | 3 +- users_ldap_mail/__manifest__.py | 4 +- users_ldap_mail/i18n/de.po | 19 +- users_ldap_mail/i18n/es.po | 19 +- users_ldap_mail/i18n/fr.po | 19 +- users_ldap_mail/i18n/hr.po | 19 +- users_ldap_mail/i18n/hr_HR.po | 19 +- users_ldap_mail/i18n/pt_BR.po | 18 +- users_ldap_mail/i18n/sl.po | 19 +- users_ldap_mail/i18n/users_ldap_mail.pot | 20 +- users_ldap_mail/i18n/zh_CN.po | 18 +- users_ldap_mail/models/__init__.py | 5 +- users_ldap_mail/models/users_ldap_model.py | 18 +- users_ldap_mail/readme/CONTRIBUTORS.rst | 4 + users_ldap_mail/readme/DESCRIPTION.rst | 3 + users_ldap_mail/readme/USAGE.rst | 9 + users_ldap_mail/static/description/index.html | 439 ++++++++++++++++++ 18 files changed, 614 insertions(+), 119 deletions(-) create mode 100644 users_ldap_mail/readme/CONTRIBUTORS.rst create mode 100644 users_ldap_mail/readme/DESCRIPTION.rst create mode 100644 users_ldap_mail/readme/USAGE.rst create mode 100644 users_ldap_mail/static/description/index.html diff --git a/users_ldap_mail/README.rst b/users_ldap_mail/README.rst index 2f4c8d27b9..20c86b76b2 100644 --- a/users_ldap_mail/README.rst +++ b/users_ldap_mail/README.rst @@ -1,15 +1,39 @@ -.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg - :target: https://www.gnu.org/licenses/agpl-3.0-standalone.html - :alt: License: AGPL-3 - -=============== -Users LDAP Mail -=============== +===================================== +LDAP mapping for user name and e-mail +===================================== + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png + :target: https://odoo-community.org/page/development-status + :alt: Beta +.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 +.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fserver--auth-lightgray.png?logo=github + :target: https://github.com/OCA/server-auth/tree/12.0/users_ldap_mail + :alt: OCA/server-auth +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/server-auth-12-0/server-auth-12-0-users_ldap_mail + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/251/12.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| This module extends the functionality of the auth_ldap module to support mail from LDAP and to allow you to get an e-mail address from LDAP accounts to Odoo users. +**Table of contents** + +.. contents:: + :local: + Usage ===== @@ -23,45 +47,45 @@ To use this module, you need to: These items will correspond with a new user that is created, when a user logs in via LDAP in Odoo. -.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas - :alt: Try me on Runbot - :target: https://runbot.odoo-community.org/runbot/repo/149 - -.. repo_id is available in https://github.com/OCA/maintainer-tools/blob/master/tools/repos_with_ids.txt -.. branch is "8.0" for example - Bug Tracker =========== -Bugs are tracked on `GitHub Issues -`_. In case of trouble, please -check there if your issue has already been reported. If you spotted it first, -help us smashing it by providing a detailed and welcomed feedback. +Bugs are tracked on `GitHub Issues `_. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us smashing it by providing a detailed and welcomed +`feedback `_. + +Do not contact contributors directly about support or help with technical issues. Credits ======= -Images ------- +Authors +~~~~~~~ -* Odoo Community Association: `Icon `_. +* Daniel Reis Contributors ------------- +~~~~~~~~~~~~ * Daniel Reis (https://launchpad.com/~dreis-pt), +* `Tecnativa `_: -Maintainer ----------- + * Alexandre Díaz + +Maintainers +~~~~~~~~~~~ + +This module is maintained by the OCA. .. image:: https://odoo-community.org/logo.png :alt: Odoo Community Association :target: https://odoo-community.org -This module is maintained by the OCA. - OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use. -To contribute to this module, please visit https://odoo-community.org. +This module is part of the `OCA/server-auth `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/users_ldap_mail/__init__.py b/users_ldap_mail/__init__.py index d75858919a..6740cf15fd 100644 --- a/users_ldap_mail/__init__.py +++ b/users_ldap_mail/__init__.py @@ -1,5 +1,4 @@ -# © Daniel Reis (https://launchpad.com/~dreis-pt) +# Copyright Daniel Reis (https://launchpad.com/~dreis-pt) # License AGPL-3.0 or later (http://www.gnu.org/licenses/gpl.html). from . import models - diff --git a/users_ldap_mail/__manifest__.py b/users_ldap_mail/__manifest__.py index d9db65419f..47cd72c0e9 100644 --- a/users_ldap_mail/__manifest__.py +++ b/users_ldap_mail/__manifest__.py @@ -1,9 +1,9 @@ -# © Daniel Reis (https://launchpad.com/~dreis-pt) +# Copyright Daniel Reis (https://launchpad.com/~dreis-pt) # License AGPL-3.0 or later (http://www.gnu.org/licenses/gpl.html). { 'name': "LDAP mapping for user name and e-mail", - 'version': "11.0.1.0.0", + 'version': "12.0.1.0.0", 'depends': ["auth_ldap"], 'author': "Daniel Reis," "Odoo Community Association (OCA)", diff --git a/users_ldap_mail/i18n/de.po b/users_ldap_mail/i18n/de.po index c7e0297717..f0ed06a308 100644 --- a/users_ldap_mail/i18n/de.po +++ b/users_ldap_mail/i18n/de.po @@ -20,7 +20,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: users_ldap_mail -#: model:ir.model.fields,help:users_ldap_mail.field_res_company_ldap_name_attribute +#: model:ir.model.fields,help:users_ldap_mail.field_res_company_ldap__name_attribute msgid "" "By default 'cn' is used. For ActiveDirectory you might use 'displayName' " "instead." @@ -29,21 +29,24 @@ msgstr "" "'displayName' verwenden." #. module: users_ldap_mail -#: model:ir.model.fields,field_description:users_ldap_mail.field_res_company_ldap_mail_attribute +#: model:ir.model,name:users_ldap_mail.model_res_company_ldap +msgid "Company LDAP configuration" +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 "Email-Attribut" #. module: users_ldap_mail -#: model:ir.model.fields,help:users_ldap_mail.field_res_company_ldap_mail_attribute +#: model:ir.model.fields,help:users_ldap_mail.field_res_company_ldap__mail_attribute msgid "LDAP attribute to use to retrieve em-mail address." msgstr "LDAP-Attribut, um eine Email-Adresse zu erhalten." #. module: users_ldap_mail -#: model:ir.model.fields,field_description:users_ldap_mail.field_res_company_ldap_name_attribute +#: model:ir.model.fields,field_description:users_ldap_mail.field_res_company_ldap__name_attribute msgid "Name Attribute" msgstr "Namens-Attribut" -#. module: users_ldap_mail -#: model:ir.model,name:users_ldap_mail.model_res_company_ldap -msgid "res.company.ldap" -msgstr "res.company.ldap" +#~ msgid "res.company.ldap" +#~ msgstr "res.company.ldap" diff --git a/users_ldap_mail/i18n/es.po b/users_ldap_mail/i18n/es.po index 64583845d8..f37fcb8e11 100644 --- a/users_ldap_mail/i18n/es.po +++ b/users_ldap_mail/i18n/es.po @@ -21,7 +21,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: users_ldap_mail -#: model:ir.model.fields,help:users_ldap_mail.field_res_company_ldap_name_attribute +#: model:ir.model.fields,help:users_ldap_mail.field_res_company_ldap__name_attribute msgid "" "By default 'cn' is used. For ActiveDirectory you might use 'displayName' " "instead." @@ -30,21 +30,24 @@ msgstr "" "en su lugar." #. module: users_ldap_mail -#: model:ir.model.fields,field_description:users_ldap_mail.field_res_company_ldap_mail_attribute +#: model:ir.model,name:users_ldap_mail.model_res_company_ldap +msgid "Company LDAP configuration" +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 "Atributo e-mail" #. module: users_ldap_mail -#: model:ir.model.fields,help:users_ldap_mail.field_res_company_ldap_mail_attribute +#: model:ir.model.fields,help:users_ldap_mail.field_res_company_ldap__mail_attribute msgid "LDAP attribute to use to retrieve em-mail address." msgstr "Atributo LDAP a utilizar para recumerar la dirección em-mail." #. module: users_ldap_mail -#: model:ir.model.fields,field_description:users_ldap_mail.field_res_company_ldap_name_attribute +#: model:ir.model.fields,field_description:users_ldap_mail.field_res_company_ldap__name_attribute msgid "Name Attribute" msgstr "Atributo Nombre" -#. module: users_ldap_mail -#: model:ir.model,name:users_ldap_mail.model_res_company_ldap -msgid "res.company.ldap" -msgstr "res.company.ldap" +#~ msgid "res.company.ldap" +#~ msgstr "res.company.ldap" diff --git a/users_ldap_mail/i18n/fr.po b/users_ldap_mail/i18n/fr.po index ac43b824c4..12900bd57c 100644 --- a/users_ldap_mail/i18n/fr.po +++ b/users_ldap_mail/i18n/fr.po @@ -19,28 +19,31 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #. module: users_ldap_mail -#: model:ir.model.fields,help:users_ldap_mail.field_res_company_ldap_name_attribute +#: model:ir.model.fields,help:users_ldap_mail.field_res_company_ldap__name_attribute msgid "" "By default 'cn' is used. For ActiveDirectory you might use 'displayName' " "instead." msgstr "" #. module: users_ldap_mail -#: model:ir.model.fields,field_description:users_ldap_mail.field_res_company_ldap_mail_attribute +#: model:ir.model,name:users_ldap_mail.model_res_company_ldap +msgid "Company LDAP configuration" +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,help:users_ldap_mail.field_res_company_ldap_mail_attribute +#: model:ir.model.fields,help:users_ldap_mail.field_res_company_ldap__mail_attribute msgid "LDAP attribute to use to retrieve em-mail address." msgstr "" #. module: users_ldap_mail -#: model:ir.model.fields,field_description:users_ldap_mail.field_res_company_ldap_name_attribute +#: model:ir.model.fields,field_description:users_ldap_mail.field_res_company_ldap__name_attribute msgid "Name Attribute" msgstr "" -#. module: users_ldap_mail -#: model:ir.model,name:users_ldap_mail.model_res_company_ldap -msgid "res.company.ldap" -msgstr "res.company.ldap" +#~ msgid "res.company.ldap" +#~ msgstr "res.company.ldap" diff --git a/users_ldap_mail/i18n/hr.po b/users_ldap_mail/i18n/hr.po index 38c53685db..ef2b85fbbf 100644 --- a/users_ldap_mail/i18n/hr.po +++ b/users_ldap_mail/i18n/hr.po @@ -21,7 +21,7 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" #. module: users_ldap_mail -#: model:ir.model.fields,help:users_ldap_mail.field_res_company_ldap_name_attribute +#: model:ir.model.fields,help:users_ldap_mail.field_res_company_ldap__name_attribute msgid "" "By default 'cn' is used. For ActiveDirectory you might use 'displayName' " "instead." @@ -30,21 +30,24 @@ msgstr "" "umjesto zadanog." #. module: users_ldap_mail -#: model:ir.model.fields,field_description:users_ldap_mail.field_res_company_ldap_mail_attribute +#: model:ir.model,name:users_ldap_mail.model_res_company_ldap +msgid "Company LDAP configuration" +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 "Atribut e-mail" #. module: users_ldap_mail -#: model:ir.model.fields,help:users_ldap_mail.field_res_company_ldap_mail_attribute +#: model:ir.model.fields,help:users_ldap_mail.field_res_company_ldap__mail_attribute msgid "LDAP attribute to use to retrieve em-mail address." msgstr "LDAP atribut za dohvat email adresa." #. module: users_ldap_mail -#: model:ir.model.fields,field_description:users_ldap_mail.field_res_company_ldap_name_attribute +#: model:ir.model.fields,field_description:users_ldap_mail.field_res_company_ldap__name_attribute msgid "Name Attribute" msgstr "Atribut naziva" -#. module: users_ldap_mail -#: model:ir.model,name:users_ldap_mail.model_res_company_ldap -msgid "res.company.ldap" -msgstr "res.company.ldap" +#~ msgid "res.company.ldap" +#~ msgstr "res.company.ldap" diff --git a/users_ldap_mail/i18n/hr_HR.po b/users_ldap_mail/i18n/hr_HR.po index d3509508d3..97257cab78 100644 --- a/users_ldap_mail/i18n/hr_HR.po +++ b/users_ldap_mail/i18n/hr_HR.po @@ -21,7 +21,7 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" #. module: users_ldap_mail -#: model:ir.model.fields,help:users_ldap_mail.field_res_company_ldap_name_attribute +#: model:ir.model.fields,help:users_ldap_mail.field_res_company_ldap__name_attribute msgid "" "By default 'cn' is used. For ActiveDirectory you might use 'displayName' " "instead." @@ -29,21 +29,24 @@ msgstr "" "Zadano koristi 'cn'. Za ActiveDirectory možete koristiti i 'displayName'." #. module: users_ldap_mail -#: model:ir.model.fields,field_description:users_ldap_mail.field_res_company_ldap_mail_attribute +#: model:ir.model,name:users_ldap_mail.model_res_company_ldap +msgid "Company LDAP configuration" +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 "E-mail atribut" #. module: users_ldap_mail -#: model:ir.model.fields,help:users_ldap_mail.field_res_company_ldap_mail_attribute +#: model:ir.model.fields,help:users_ldap_mail.field_res_company_ldap__mail_attribute msgid "LDAP attribute to use to retrieve em-mail address." msgstr "LDAP atribut za dohvaćanje e-mail adrese." #. module: users_ldap_mail -#: model:ir.model.fields,field_description:users_ldap_mail.field_res_company_ldap_name_attribute +#: model:ir.model.fields,field_description:users_ldap_mail.field_res_company_ldap__name_attribute msgid "Name Attribute" msgstr "Atribut Naziv" -#. module: users_ldap_mail -#: model:ir.model,name:users_ldap_mail.model_res_company_ldap -msgid "res.company.ldap" -msgstr "res.company.ldap" +#~ msgid "res.company.ldap" +#~ msgstr "res.company.ldap" diff --git a/users_ldap_mail/i18n/pt_BR.po b/users_ldap_mail/i18n/pt_BR.po index 5fc2b6d9ac..dfef3d82f1 100644 --- a/users_ldap_mail/i18n/pt_BR.po +++ b/users_ldap_mail/i18n/pt_BR.po @@ -20,7 +20,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #. module: users_ldap_mail -#: model:ir.model.fields,help:users_ldap_mail.field_res_company_ldap_name_attribute +#: model:ir.model.fields,help:users_ldap_mail.field_res_company_ldap__name_attribute msgid "" "By default 'cn' is used. For ActiveDirectory you might use 'displayName' " "instead." @@ -28,21 +28,21 @@ msgstr "" "Por padrão 'cn' é usado. Para ActiveDirectory você pode usar 'displayName'" #. module: users_ldap_mail -#: model:ir.model.fields,field_description:users_ldap_mail.field_res_company_ldap_mail_attribute +#: model:ir.model,name:users_ldap_mail.model_res_company_ldap +msgid "Company LDAP configuration" +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 "Atributo E-mail" #. module: users_ldap_mail -#: model:ir.model.fields,help:users_ldap_mail.field_res_company_ldap_mail_attribute +#: model:ir.model.fields,help:users_ldap_mail.field_res_company_ldap__mail_attribute msgid "LDAP attribute to use to retrieve em-mail address." msgstr "Use o atributo LDAP para recuperar o endereço de e-mail" #. module: users_ldap_mail -#: model:ir.model.fields,field_description:users_ldap_mail.field_res_company_ldap_name_attribute +#: model:ir.model.fields,field_description:users_ldap_mail.field_res_company_ldap__name_attribute msgid "Name Attribute" msgstr "Atributo Nome" - -#. module: users_ldap_mail -#: model:ir.model,name:users_ldap_mail.model_res_company_ldap -msgid "res.company.ldap" -msgstr "" diff --git a/users_ldap_mail/i18n/sl.po b/users_ldap_mail/i18n/sl.po index 3092037bb4..4f3ceaeb21 100644 --- a/users_ldap_mail/i18n/sl.po +++ b/users_ldap_mail/i18n/sl.po @@ -21,7 +21,7 @@ msgstr "" "%100==4 ? 2 : 3);\n" #. module: users_ldap_mail -#: model:ir.model.fields,help:users_ldap_mail.field_res_company_ldap_name_attribute +#: model:ir.model.fields,help:users_ldap_mail.field_res_company_ldap__name_attribute msgid "" "By default 'cn' is used. For ActiveDirectory you might use 'displayName' " "instead." @@ -30,21 +30,24 @@ msgstr "" "uporabili 'displayName'." #. module: users_ldap_mail -#: model:ir.model.fields,field_description:users_ldap_mail.field_res_company_ldap_mail_attribute +#: model:ir.model,name:users_ldap_mail.model_res_company_ldap +msgid "Company LDAP configuration" +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 "E-poštni atribut" #. module: users_ldap_mail -#: model:ir.model.fields,help:users_ldap_mail.field_res_company_ldap_mail_attribute +#: model:ir.model.fields,help:users_ldap_mail.field_res_company_ldap__mail_attribute msgid "LDAP attribute to use to retrieve em-mail address." msgstr "LDAP atribut za uporabo pri pridobivanju e-poštnih naslovov." #. module: users_ldap_mail -#: model:ir.model.fields,field_description:users_ldap_mail.field_res_company_ldap_name_attribute +#: model:ir.model.fields,field_description:users_ldap_mail.field_res_company_ldap__name_attribute msgid "Name Attribute" msgstr "Naziv atributa" -#. module: users_ldap_mail -#: model:ir.model,name:users_ldap_mail.model_res_company_ldap -msgid "res.company.ldap" -msgstr "res.company.ldap" +#~ msgid "res.company.ldap" +#~ msgstr "res.company.ldap" diff --git a/users_ldap_mail/i18n/users_ldap_mail.pot b/users_ldap_mail/i18n/users_ldap_mail.pot index c578c91f4d..694899fca0 100644 --- a/users_ldap_mail/i18n/users_ldap_mail.pot +++ b/users_ldap_mail/i18n/users_ldap_mail.pot @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 11.0\n" +"Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" "Last-Translator: <>\n" "Language-Team: \n" @@ -14,27 +14,27 @@ msgstr "" "Plural-Forms: \n" #. module: users_ldap_mail -#: model:ir.model.fields,help:users_ldap_mail.field_res_company_ldap_name_attribute +#: model:ir.model.fields,help:users_ldap_mail.field_res_company_ldap__name_attribute msgid "By default 'cn' is used. For ActiveDirectory you might use 'displayName' instead." msgstr "" #. module: users_ldap_mail -#: model:ir.model.fields,field_description:users_ldap_mail.field_res_company_ldap_mail_attribute -msgid "E-mail attribute" +#: model:ir.model,name:users_ldap_mail.model_res_company_ldap +msgid "Company LDAP configuration" 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." +#: 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_name_attribute -msgid "Name Attribute" +#: model:ir.model.fields,help:users_ldap_mail.field_res_company_ldap__mail_attribute +msgid "LDAP attribute to use to retrieve em-mail address." msgstr "" #. module: users_ldap_mail -#: model:ir.model,name:users_ldap_mail.model_res_company_ldap -msgid "res.company.ldap" +#: model:ir.model.fields,field_description:users_ldap_mail.field_res_company_ldap__name_attribute +msgid "Name Attribute" msgstr "" diff --git a/users_ldap_mail/i18n/zh_CN.po b/users_ldap_mail/i18n/zh_CN.po index f217c1462d..1519f47cc0 100644 --- a/users_ldap_mail/i18n/zh_CN.po +++ b/users_ldap_mail/i18n/zh_CN.po @@ -20,28 +20,28 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" #. module: users_ldap_mail -#: model:ir.model.fields,help:users_ldap_mail.field_res_company_ldap_name_attribute +#: model:ir.model.fields,help:users_ldap_mail.field_res_company_ldap__name_attribute msgid "" "By default 'cn' is used. For ActiveDirectory you might use 'displayName' " "instead." msgstr "" #. module: users_ldap_mail -#: model:ir.model.fields,field_description:users_ldap_mail.field_res_company_ldap_mail_attribute +#: model:ir.model,name:users_ldap_mail.model_res_company_ldap +msgid "Company LDAP configuration" +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 "E-mail 属性" #. module: users_ldap_mail -#: model:ir.model.fields,help:users_ldap_mail.field_res_company_ldap_mail_attribute +#: model:ir.model.fields,help:users_ldap_mail.field_res_company_ldap__mail_attribute msgid "LDAP attribute to use to retrieve em-mail address." msgstr "" #. module: users_ldap_mail -#: model:ir.model.fields,field_description:users_ldap_mail.field_res_company_ldap_name_attribute +#: model:ir.model.fields,field_description:users_ldap_mail.field_res_company_ldap__name_attribute msgid "Name Attribute" msgstr "名称属性" - -#. module: users_ldap_mail -#: model:ir.model,name:users_ldap_mail.model_res_company_ldap -msgid "res.company.ldap" -msgstr "" diff --git a/users_ldap_mail/models/__init__.py b/users_ldap_mail/models/__init__.py index 42c6293ea9..4a58f52e68 100644 --- a/users_ldap_mail/models/__init__.py +++ b/users_ldap_mail/models/__init__.py @@ -1,5 +1,4 @@ -# © Daniel Reis (https://launchpad.com/~dreis-pt) -# License AGPL-3.0 or later (http://www.gnu.org/licenses/gpl.html). +# Copyright Daniel Reis (https://launchpad.com/~dreis-pt) +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from . import users_ldap_model - diff --git a/users_ldap_mail/models/users_ldap_model.py b/users_ldap_mail/models/users_ldap_model.py index 77f4a2d705..4f76b8acb8 100644 --- a/users_ldap_mail/models/users_ldap_model.py +++ b/users_ldap_mail/models/users_ldap_model.py @@ -1,10 +1,10 @@ -# © Daniel Reis (https://launchpad.com/~dreis-pt) -# License AGPL-3.0 or later (http://www.gnu.org/licenses/gpl.html). +# Copyright Daniel Reis (https://launchpad.com/~dreis-pt) +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from odoo import models, fields import logging -_log = logging.getLogger(__name__) +_logger = logging.getLogger(__name__) class CompanyLDAP(models.Model): @@ -22,7 +22,7 @@ class CompanyLDAP(models.Model): help="LDAP attribute to use to retrieve em-mail address.", ) - def get_ldap_dicts(self): + def _get_ldap_dicts(self): """ Copy of auth_ldap's funtion, changing only the SQL, so that it returns all fields in the table. @@ -30,9 +30,8 @@ def get_ldap_dicts(self): return self.sudo().search([('ldap_server', '!=', False)], order='sequence').read([]) - def map_ldap_attributes(self, conf, login, ldap_entry): - values = super(CompanyLDAP, self).map_ldap_attributes(conf, login, - ldap_entry) + def _map_ldap_attributes(self, conf, login, ldap_entry): + values = super()._map_ldap_attributes(conf, login, ldap_entry) mapping = [ ('name', 'name_attribute'), ('email', 'mail_attribute'), @@ -42,6 +41,7 @@ def map_ldap_attributes(self, conf, login, ldap_entry): if conf[conf_name]: values[value_key] = ldap_entry[1][conf[conf_name]][0] except KeyError: - _log.warning('No LDAP attribute "%s" found for login "%s"' % ( - conf.get(conf_name), values.get('login'))) + _logger.warning( + 'No LDAP attribute "%s" found for login "%s"' % ( + conf.get(conf_name), values.get('login'))) return values diff --git a/users_ldap_mail/readme/CONTRIBUTORS.rst b/users_ldap_mail/readme/CONTRIBUTORS.rst new file mode 100644 index 0000000000..a6b11bf5e0 --- /dev/null +++ b/users_ldap_mail/readme/CONTRIBUTORS.rst @@ -0,0 +1,4 @@ +* Daniel Reis (https://launchpad.com/~dreis-pt), +* `Tecnativa `_: + + * Alexandre Díaz diff --git a/users_ldap_mail/readme/DESCRIPTION.rst b/users_ldap_mail/readme/DESCRIPTION.rst new file mode 100644 index 0000000000..5298692bde --- /dev/null +++ b/users_ldap_mail/readme/DESCRIPTION.rst @@ -0,0 +1,3 @@ +This module extends the functionality of the auth_ldap module to support mail +from LDAP and to allow you to get an e-mail address from LDAP accounts to Odoo +users. diff --git a/users_ldap_mail/readme/USAGE.rst b/users_ldap_mail/readme/USAGE.rst new file mode 100644 index 0000000000..aab8f01177 --- /dev/null +++ b/users_ldap_mail/readme/USAGE.rst @@ -0,0 +1,9 @@ +To use this module, you need to: + +#. Open Odoo in your browser +#. Go to Settings +#. Go to General Settings +#. In The General Settings form go to LDAP Parameters +#. In a LDAP Parameters item there are two new fields: mail and name, the name + These items will correspond with a new user that is created, when a user + logs in via LDAP in Odoo. diff --git a/users_ldap_mail/static/description/index.html b/users_ldap_mail/static/description/index.html new file mode 100644 index 0000000000..72a928236e --- /dev/null +++ b/users_ldap_mail/static/description/index.html @@ -0,0 +1,439 @@ + + + + + + +LDAP mapping for user name and e-mail + + + +
+

LDAP mapping for user name and e-mail

+ + +

Beta License: AGPL-3 OCA/server-auth Translate me on Weblate Try me on Runbot

+

This module extends the functionality of the auth_ldap module to support mail +from LDAP and to allow you to get an e-mail address from LDAP accounts to Odoo +users.

+

Table of contents

+ +
+

Usage

+

To use this module, you need to:

+
    +
  1. Open Odoo in your browser
    2. +
  2. Go to Settings
    3. +
  3. Go to General Settings
    4. +
  4. In The General Settings form go to LDAP Parameters
    5. +
  5. In a LDAP Parameters item there are two new fields: mail and name, the name +These items will correspond with a new user that is created, when a user +logs in via LDAP in Odoo.
    6. +
+
+
+

Bug Tracker

+

Bugs are tracked on GitHub Issues. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us smashing it by providing a detailed and welcomed +feedback.

+

Do not contact contributors directly about support or help with technical issues.

+
+
+

Credits

+
+

Authors

+
    +
  • Daniel Reis
    • +
+
+
+

Contributors

+ +
+
+

Maintainers

+

This module is maintained by the OCA.

+Odoo Community Association +

OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use.

+

This module is part of the OCA/server-auth project on GitHub.

+

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

+
+
+
+ + From 1eeaccd6bd134b0bcf7638c52542b9d97f12663b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Marques?= Date: Thu, 4 Feb 2021 14:23:45 +0000 Subject: [PATCH 08/13] [IMP] users_ldap_mail: black, isort, prettier --- users_ldap_mail/__manifest__.py | 19 ++++++------- users_ldap_mail/models/users_ldap_model.py | 33 +++++++++++++--------- users_ldap_mail/views/res_company_ldap.xml | 9 +++--- 3 files changed, 31 insertions(+), 30 deletions(-) diff --git a/users_ldap_mail/__manifest__.py b/users_ldap_mail/__manifest__.py index 47cd72c0e9..2f77dba286 100644 --- a/users_ldap_mail/__manifest__.py +++ b/users_ldap_mail/__manifest__.py @@ -2,15 +2,12 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/gpl.html). { - 'name': "LDAP mapping for user name and e-mail", - 'version': "12.0.1.0.0", - 'depends': ["auth_ldap"], - 'author': "Daniel Reis," - "Odoo Community Association (OCA)", - 'license': 'AGPL-3', - 'category': "Tools", - 'data': [ - 'views/res_company_ldap.xml', - ], - 'installable': True, + "name": "LDAP mapping for user name and e-mail", + "version": "12.0.1.0.0", + "depends": ["auth_ldap"], + "author": "Daniel Reis," "Odoo Community Association (OCA)", + "license": "AGPL-3", + "category": "Tools", + "data": ["views/res_company_ldap.xml",], + "installable": True, } diff --git a/users_ldap_mail/models/users_ldap_model.py b/users_ldap_mail/models/users_ldap_model.py index 4f76b8acb8..f6ff6d9595 100644 --- a/users_ldap_mail/models/users_ldap_model.py +++ b/users_ldap_mail/models/users_ldap_model.py @@ -1,24 +1,25 @@ # Copyright Daniel Reis (https://launchpad.com/~dreis-pt) # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from odoo import models, fields - import logging + +from odoo import fields, models + _logger = logging.getLogger(__name__) class CompanyLDAP(models.Model): - _inherit = 'res.company.ldap' + _inherit = "res.company.ldap" name_attribute = fields.Char( - 'Name Attribute', - default='cn', + "Name Attribute", + default="cn", help="By default 'cn' is used. " - "For ActiveDirectory you might use 'displayName' instead.", + "For ActiveDirectory you might use 'displayName' instead.", ) mail_attribute = fields.Char( - 'E-mail attribute', - default='mail', + "E-mail attribute", + default="mail", help="LDAP attribute to use to retrieve em-mail address.", ) @@ -27,14 +28,17 @@ def _get_ldap_dicts(self): Copy of auth_ldap's funtion, changing only the SQL, so that it returns all fields in the table. """ - return self.sudo().search([('ldap_server', '!=', False)], - order='sequence').read([]) + return ( + self.sudo() + .search([("ldap_server", "!=", False)], order="sequence") + .read([]) + ) def _map_ldap_attributes(self, conf, login, ldap_entry): values = super()._map_ldap_attributes(conf, login, ldap_entry) mapping = [ - ('name', 'name_attribute'), - ('email', 'mail_attribute'), + ("name", "name_attribute"), + ("email", "mail_attribute"), ] for value_key, conf_name in mapping: try: @@ -42,6 +46,7 @@ def _map_ldap_attributes(self, conf, login, ldap_entry): values[value_key] = ldap_entry[1][conf[conf_name]][0] except KeyError: _logger.warning( - 'No LDAP attribute "%s" found for login "%s"' % ( - conf.get(conf_name), values.get('login'))) + 'No LDAP attribute "%s" found for login "%s"' + % (conf.get(conf_name), values.get("login")) + ) return values diff --git a/users_ldap_mail/views/res_company_ldap.xml b/users_ldap_mail/views/res_company_ldap.xml index ec9f7d89c9..a1e2bb2c3e 100644 --- a/users_ldap_mail/views/res_company_ldap.xml +++ b/users_ldap_mail/views/res_company_ldap.xml @@ -1,14 +1,13 @@ - + res.company.ldap.form res.company.ldap - + - - + + From 658bc475cc07222ba18b82d45656d17851886a07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Marques?= Date: Fri, 5 Feb 2021 07:43:40 +0000 Subject: [PATCH 09/13] [MIG] users_ldap_mail: Migration to 13.0 --- users_ldap_mail/README.rst | 39 ++++++++++---- users_ldap_mail/__manifest__.py | 7 ++- users_ldap_mail/readme/CONTRIBUTORS.rst | 1 + users_ldap_mail/readme/ROADMAP.rst | 2 + users_ldap_mail/readme/USAGE.rst | 14 ++--- users_ldap_mail/static/description/index.html | 52 ++++++++++++------- 6 files changed, 76 insertions(+), 39 deletions(-) create mode 100644 users_ldap_mail/readme/ROADMAP.rst diff --git a/users_ldap_mail/README.rst b/users_ldap_mail/README.rst index 20c86b76b2..b9e9412b65 100644 --- a/users_ldap_mail/README.rst +++ b/users_ldap_mail/README.rst @@ -14,13 +14,13 @@ LDAP mapping for user name and e-mail :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fserver--auth-lightgray.png?logo=github - :target: https://github.com/OCA/server-auth/tree/12.0/users_ldap_mail + :target: https://github.com/OCA/server-auth/tree/13.0/users_ldap_mail :alt: OCA/server-auth .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/server-auth-12-0/server-auth-12-0-users_ldap_mail + :target: https://translation.odoo-community.org/projects/server-auth-13-0/server-auth-13-0-users_ldap_mail :alt: Translate me on Weblate .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png - :target: https://runbot.odoo-community.org/runbot/251/12.0 + :target: https://runbot.odoo-community.org/runbot/251/13.0 :alt: Try me on Runbot |badge1| |badge2| |badge3| |badge4| |badge5| @@ -40,12 +40,20 @@ Usage To use this module, you need to: #. Open Odoo in your browser -#. Go to Settings -#. Go to General Settings -#. In The General Settings form go to LDAP Parameters -#. In a LDAP Parameters item there are two new fields: mail and name, the name - These items will correspond with a new user that is created, when a user - logs in via LDAP in Odoo. +#. Go to **Settings > General Settings** +#. In the **Integrations** section click on **LDAP Server** under + **LDAP Authentication**. This will allow you to create your LDAP integration + settings. +#. When creating or editing a record, under the **Process Parameter** section + there are two new fields: mail and name, the name of these items will + correspond with a new user that is created, when a user logs in via LDAP in + Odoo. + +Known issues / Roadmap +====================== + + +* Add tests (use LDAP Mocking through something like https://mockldap.readthedocs.io/en/latest/overview.html) Bug Tracker =========== @@ -53,7 +61,7 @@ Bug Tracker Bugs are tracked on `GitHub Issues `_. In case of trouble, please check there if your issue has already been reported. If you spotted it first, help us smashing it by providing a detailed and welcomed -`feedback `_. +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -72,6 +80,7 @@ Contributors * `Tecnativa `_: * Alexandre Díaz + * João Marques Maintainers ~~~~~~~~~~~ @@ -86,6 +95,14 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use. -This module is part of the `OCA/server-auth `_ project on GitHub. +.. |maintainer-joao-p-marques| image:: https://github.com/joao-p-marques.png?size=40px + :target: https://github.com/joao-p-marques + :alt: joao-p-marques + +Current `maintainer `__: + +|maintainer-joao-p-marques| + +This module is part of the `OCA/server-auth `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/users_ldap_mail/__manifest__.py b/users_ldap_mail/__manifest__.py index 2f77dba286..45bb841119 100644 --- a/users_ldap_mail/__manifest__.py +++ b/users_ldap_mail/__manifest__.py @@ -1,13 +1,16 @@ # Copyright Daniel Reis (https://launchpad.com/~dreis-pt) +# Copyright 2021 Tecnativa - João Marques # License AGPL-3.0 or later (http://www.gnu.org/licenses/gpl.html). { "name": "LDAP mapping for user name and e-mail", - "version": "12.0.1.0.0", + "version": "13.0.1.0.0", "depends": ["auth_ldap"], "author": "Daniel Reis," "Odoo Community Association (OCA)", + "maintainers": ["joao-p-marques"], + "website": "https://github.com/OCA/server-auth", "license": "AGPL-3", "category": "Tools", - "data": ["views/res_company_ldap.xml",], + "data": ["views/res_company_ldap.xml"], "installable": True, } diff --git a/users_ldap_mail/readme/CONTRIBUTORS.rst b/users_ldap_mail/readme/CONTRIBUTORS.rst index a6b11bf5e0..8eefba611f 100644 --- a/users_ldap_mail/readme/CONTRIBUTORS.rst +++ b/users_ldap_mail/readme/CONTRIBUTORS.rst @@ -2,3 +2,4 @@ * `Tecnativa `_: * Alexandre Díaz + * João Marques diff --git a/users_ldap_mail/readme/ROADMAP.rst b/users_ldap_mail/readme/ROADMAP.rst new file mode 100644 index 0000000000..e9bdebcf5f --- /dev/null +++ b/users_ldap_mail/readme/ROADMAP.rst @@ -0,0 +1,2 @@ + +* Add tests (use LDAP Mocking through something like https://mockldap.readthedocs.io/en/latest/overview.html) diff --git a/users_ldap_mail/readme/USAGE.rst b/users_ldap_mail/readme/USAGE.rst index aab8f01177..9c70b69317 100644 --- a/users_ldap_mail/readme/USAGE.rst +++ b/users_ldap_mail/readme/USAGE.rst @@ -1,9 +1,11 @@ To use this module, you need to: #. Open Odoo in your browser -#. Go to Settings -#. Go to General Settings -#. In The General Settings form go to LDAP Parameters -#. In a LDAP Parameters item there are two new fields: mail and name, the name - These items will correspond with a new user that is created, when a user - logs in via LDAP in Odoo. +#. Go to **Settings > General Settings** +#. In the **Integrations** section click on **LDAP Server** under + **LDAP Authentication**. This will allow you to create your LDAP integration + settings. +#. When creating or editing a record, under the **Process Parameter** section + there are two new fields: mail and name, the name of these items will + correspond with a new user that is created, when a user logs in via LDAP in + Odoo. diff --git a/users_ldap_mail/static/description/index.html b/users_ldap_mail/static/description/index.html index 72a928236e..650ea3ac65 100644 --- a/users_ldap_mail/static/description/index.html +++ b/users_ldap_mail/static/description/index.html @@ -3,7 +3,7 @@ - + LDAP mapping for user name and e-mail