From 1d8dcb262842f14b80e2c66a5770d79fa0e96b28 Mon Sep 17 00:00:00 2001
From: Tom Teichler <tom.teichler@teckids.org>
Date: Fri, 27 Mar 2020 21:55:34 +0100
Subject: [PATCH] Remove useless bolean
---
aleksis/apps/ldap/settings.py | 1 -
aleksis/apps/ldap/util/ldap_sync.py | 17 ++++++++---------
2 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/aleksis/apps/ldap/settings.py b/aleksis/apps/ldap/settings.py
index 57f0754..be98b20 100644
--- a/aleksis/apps/ldap/settings.py
+++ b/aleksis/apps/ldap/settings.py
@@ -24,7 +24,6 @@ CONSTANCE_CONFIG = {
_("LDAP sync matching fields"),
"matching-fields-select",
),
- "LDAP_SYNC_ADDITIONAL_FIELDS": (True, _("Sync additional fields such as postal address or date of birth."), bool)
"LDAP_SYNC_FIELD_STREET": (None, _("Field for street"), str),
"LDAP_SYNC_FIELD_HOUSENUMBER": (None, _("Field for house number"), str),
"LDAP_SYNC_FIELD_POSTAL_CODE": (None, _("Field for postal code"), str),
diff --git a/aleksis/apps/ldap/util/ldap_sync.py b/aleksis/apps/ldap/util/ldap_sync.py
index 2260d3b..4519e5d 100644
--- a/aleksis/apps/ldap/util/ldap_sync.py
+++ b/aleksis/apps/ldap/util/ldap_sync.py
@@ -36,15 +36,14 @@ def ldap_create_user(sender, instance, created, raw, using, update_fields, **kwa
)
# Sync additional fields if enabled in config.
- if config.LDAP_SYNC_ADDITIONAL_FIELDS:
- ldap_user = instance.ldap_user
- person.street = ldap_user.attrs.data[config.LDAP_SYNC_FIELD_STREET]
- person.housenumber = ldap_user.attrs.data[config.LDAP_SYNC_FIELD_HOUSENUMBER]
- person.postal_code = ldap_user.attrs.data[config.LDAP_SYNC_FIELD_POSTAL_CODE]
- person.place = ldap_user.attrs.data[config.LDAP_SYNC_FIELD_PLACE]
- person.phone_number = ldap_user.attrs.data[config.LDAP_SYNC_FIELD_PHONE_NUMBER]
- person.mobile_number = ldap_user.attrs.data[config.LDAP_SYNC_FIELD_MOBILE_NUMBER]
- person.date_of_birth = ldap_user.attrs.data[config.LDAP_SYNC_FIELD_DATE_OF_BIRTH]
+ ldap_user = instance.ldap_user
+ person.street = ldap_user.attrs.data[config.LDAP_SYNC_FIELD_STREET]
+ person.housenumber = ldap_user.attrs.data[config.LDAP_SYNC_FIELD_HOUSENUMBER]
+ person.postal_code = ldap_user.attrs.data[config.LDAP_SYNC_FIELD_POSTAL_CODE]
+ person.place = ldap_user.attrs.data[config.LDAP_SYNC_FIELD_PLACE]
+ person.phone_number = ldap_user.attrs.data[config.LDAP_SYNC_FIELD_PHONE_NUMBER]
+ person.mobile_number = ldap_user.attrs.data[config.LDAP_SYNC_FIELD_MOBILE_NUMBER]
+ person.date_of_birth = ldap_user.attrs.data[config.LDAP_SYNC_FIELD_DATE_OF_BIRTH]
# Save person if enabled in config or no new person was created.
if config.LDAP_SYNC_CREATE or not created:
--
GitLab