From 64495f8c5c16c82af9189460fdfee75c1d94cec1 Mon Sep 17 00:00:00 2001 From: Jonathan Weth Date: Thu, 23 Jun 2022 11:28:36 +0200 Subject: [PATCH 1/4] Bump version to 2.2 --- CHANGELOG.rst | 5 +++-- docs/conf.py | 4 ++-- pyproject.toml | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 310f17b..fa8075e 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -6,8 +6,8 @@ All notable changes to this project will be documented in this file. The format is based on `Keep a Changelog`_, and this project adheres to `Semantic Versioning`_. -Unreleased ----------- +`2.2`_ - 2022-06-23 +------------------- Added ~~~~~ @@ -110,3 +110,4 @@ Added .. _2.0: https://edugit.org/AlekSIS/Official/AlekSIS-App-LDAP/-/tags/2.0 .. _2.0.1: https://edugit.org/AlekSIS/Official/AlekSIS-App-LDAP/-/tags/2.0.1 .. _2.1: https://edugit.org/AlekSIS/Official/AlekSIS-App-LDAP/-/tags/2.1 +.. _2.2: https://edugit.org/AlekSIS/Official/AlekSIS-App-LDAP/-/tags/2.2 diff --git a/docs/conf.py b/docs/conf.py index 24bd662..cf41cc7 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -29,9 +29,9 @@ copyright = "2020-2022 The AlekSIS team" author = "The AlekSIS Team" # The short X.Y version -version = "2.1" +version = "2.2" # The full version, including alpha/beta/rc tags -release = "2.1.1.dev0" +release = "2.2" # -- General configuration --------------------------------------------------- diff --git a/pyproject.toml b/pyproject.toml index 748d562..6a4df4c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "AlekSIS-App-LDAP" -version = "2.1.1.dev0" +version = "2.2" packages = [ { include = "aleksis" } ] -- GitLab From 46d201787738c168d0bcbab45469df56d53b13a5 Mon Sep 17 00:00:00 2001 From: Jonathan Weth Date: Thu, 23 Jun 2022 11:35:29 +0200 Subject: [PATCH 2/4] Comment out preference for creating LDAP users without functionality --- CHANGELOG.rst | 5 +++++ aleksis/apps/ldap/preferences.py | 32 ++++++++++++++++---------------- 2 files changed, 21 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index fa8075e..40403bb 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -14,6 +14,11 @@ Added * Add Ukrainian locale (contributed by Sergiy Gorichenko from Fre(i)e Software GmbH). +Fixed +~~~~~ + +* Remove preferences for the not yet available functionality to create LDAP users on register. + `2.1`_ - 2022-01-21 ------------------- diff --git a/aleksis/apps/ldap/preferences.py b/aleksis/apps/ldap/preferences.py index 229f0a1..9a85f53 100644 --- a/aleksis/apps/ldap/preferences.py +++ b/aleksis/apps/ldap/preferences.py @@ -35,22 +35,22 @@ class LDAPPersonSyncOnLogin(BooleanPreference): verbose_name = _("Sync LDAP user with person on login") -@site_preferences_registry.register -class LDAPUserCreateOnRegister(BooleanPreference): - section = ldap - name = "user_create_on_register" - default = True - required = False - verbose_name = _("Create LDAP user on registration") - - -@site_preferences_registry.register -class LDAPUserCreateRDNFields(StringPreference): - section = ldap - name = "user_create_rdn_fields" - default = "uid" - required = False - verbose_name = _("Comma-separated list of RDN fields for new user entries") +# @site_preferences_registry.register +# class LDAPUserCreateOnRegister(BooleanPreference): +# section = ldap +# name = "user_create_on_register" +# default = True +# required = False +# verbose_name = _("Create LDAP user on registration") + + +# @site_preferences_registry.register +# class LDAPUserCreateRDNFields(StringPreference): +# section = ldap +# name = "user_create_rdn_fields" +# default = "uid" +# required = False +# verbose_name = _("Comma-separated list of RDN fields for new user entries") @site_preferences_registry.register -- GitLab From e962b4920b830b5b4ff8b67a11e306f89017c448 Mon Sep 17 00:00:00 2001 From: Jonathan Weth Date: Fri, 24 Jun 2022 11:31:55 +0200 Subject: [PATCH 3/4] Bump version to 2.2.1.dev0 --- CHANGELOG.rst | 3 +++ docs/conf.py | 2 +- pyproject.toml | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 40403bb..442cafe 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -6,6 +6,9 @@ All notable changes to this project will be documented in this file. The format is based on `Keep a Changelog`_, and this project adheres to `Semantic Versioning`_. +Unreleased +---------- + `2.2`_ - 2022-06-23 ------------------- diff --git a/docs/conf.py b/docs/conf.py index cf41cc7..55ea980 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -31,7 +31,7 @@ author = "The AlekSIS Team" # The short X.Y version version = "2.2" # The full version, including alpha/beta/rc tags -release = "2.2" +release = "2.2.1.dev0" # -- General configuration --------------------------------------------------- diff --git a/pyproject.toml b/pyproject.toml index 6a4df4c..6ae35df 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "AlekSIS-App-LDAP" -version = "2.2" +version = "2.2.1.dev0" packages = [ { include = "aleksis" } ] -- GitLab From e0db0888c82701f74446687038dcdab334e207ae Mon Sep 17 00:00:00 2001 From: Dominik George Date: Fri, 24 Jun 2022 14:11:25 +0000 Subject: [PATCH 4/4] Revert commenting out of preferences --- aleksis/apps/ldap/preferences.py | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/aleksis/apps/ldap/preferences.py b/aleksis/apps/ldap/preferences.py index 9a85f53..229f0a1 100644 --- a/aleksis/apps/ldap/preferences.py +++ b/aleksis/apps/ldap/preferences.py @@ -35,22 +35,22 @@ class LDAPPersonSyncOnLogin(BooleanPreference): verbose_name = _("Sync LDAP user with person on login") -# @site_preferences_registry.register -# class LDAPUserCreateOnRegister(BooleanPreference): -# section = ldap -# name = "user_create_on_register" -# default = True -# required = False -# verbose_name = _("Create LDAP user on registration") - - -# @site_preferences_registry.register -# class LDAPUserCreateRDNFields(StringPreference): -# section = ldap -# name = "user_create_rdn_fields" -# default = "uid" -# required = False -# verbose_name = _("Comma-separated list of RDN fields for new user entries") +@site_preferences_registry.register +class LDAPUserCreateOnRegister(BooleanPreference): + section = ldap + name = "user_create_on_register" + default = True + required = False + verbose_name = _("Create LDAP user on registration") + + +@site_preferences_registry.register +class LDAPUserCreateRDNFields(StringPreference): + section = ldap + name = "user_create_rdn_fields" + default = "uid" + required = False + verbose_name = _("Comma-separated list of RDN fields for new user entries") @site_preferences_registry.register -- GitLab