diff --git a/doc/guides/docker.rst b/doc/guides/docker.rst index f469d9180..6057d5898 100644 --- a/doc/guides/docker.rst +++ b/doc/guides/docker.rst @@ -7,6 +7,7 @@ Installing Docker and Docker Compose ------------------------------------ Prerequisites *nothing* + You need to install * `Docker-engine `__ ``≥19.03.0`` diff --git a/ldap_sync/sources/db.py b/ldap_sync/sources/db.py index 83f4a7819..405d9d68a 100644 --- a/ldap_sync/sources/db.py +++ b/ldap_sync/sources/db.py @@ -47,7 +47,7 @@ def _fetch_db_users( ) -> list[_UserProxyType]: """Fetch users to be synced, plus whether ``ldap_login_enabled`` is set. - If the `` ldap_login_enabled`` flag is not present, + If the ``ldap_login_enabled`` flag is not present, we interpret this as ``should_be_blocked``. :param session: The SQLAlchemy session to use @@ -199,7 +199,7 @@ class _PropertyProxyType(NamedTuple): def _fetch_db_properties(session: Session) -> list[_PropertyProxyType]: """Fetch the groups who should be synced. - Explicitly, this returns everything in :ref:`EXPORTED_PROPERTIES` together with + Explicitly, this returns everything in :data:`EXPORTED_PROPERTIES` together with the current users having the respective property as members. :param session: The SQLAlchemy session to use @@ -246,6 +246,7 @@ def fetch_db_properties( ) +#: The properties of a user we export to LDAP. EXPORTED_PROPERTIES = frozenset( [ "network_access", diff --git a/pycroft/lib/user.py b/pycroft/lib/user.py index ecbae27bf..71102fcf1 100644 --- a/pycroft/lib/user.py +++ b/pycroft/lib/user.py @@ -573,7 +573,7 @@ def edit_email( :param email_forwarded: Boolean if emails should be forwarded :param processor: User object of the processor, which issues the change :param is_confirmed: If the email address is already confirmed - :return:Changed user object + :return: Changed user object """ if not can_target(user, processor): @@ -623,8 +623,8 @@ def edit_birthdate(user: User, birthdate: date, processor: User) -> User: :param user: User object to change :param birthdate: New birthdate - :param processor:User object of the processor, which issues the change - :return:Changed user object + :param processor: User object of the processor, which issues the change + :return: Changed user object """ if not birthdate: