Merge branch 'release/v1.17.1-1'

Author: nfranzeck

CHANGELOG.md

@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [v1.17.1-1] - 2024-11-05
+### Fixed
+- Only show external-user-hint if user is marked as external [#177]
+- Fix list structure in gui docs
+
 ## [v1.17.0-1] - 2024-10-29
 ### Changed
 - Mark external users [#173]

Dockerfile

@@ -75,7 +75,7 @@ FROM registry.cloudogu.com/official/java:8u402-6
 ARG TOMCAT_VERSION
 
 LABEL NAME="official/usermgt" \
-   VERSION="1.17.0-1" \
+   VERSION="1.17.1-1" \
    maintainer="[email protected]"
 
 # mark as webapp for nginx

Makefile

@@ -1,6 +1,6 @@
 # Set these to the desired values
 ARTIFACT_ID=usermgt
-VERSION=1.17.0-1
+VERSION=1.17.1-1
 # overwrite ADDITIONAL_LDFLAGS to disable static compilation
 # this should fix https://github.com/golang/go/issues/13470
 ADDITIONAL_LDFLAGS=""

app/src/main/ui/src/components/users/UserForm.tsx

@@ -98,9 +98,11 @@ export default function UserForm<T extends User>(props: UserFormProps<T>) {
             <Prompt when={handler.dirty && !handler.isSubmitting} message={t("generic.notification.form.prompt")}/>
             <Form handler={handler}>
                 {notification}
-                <span className={"font-bold"}>
-                    {t("users.externalUserWarning")}
-                </span>
+                {(props.initialUser.external) && (
+                    <span className={"font-bold"}>
+                        {t("users.externalUserWarning")}
+                    </span>
+                )}
                 <Form.ValidatedTextInput type={"text"} name={"username"} disabled={props.disableUsernameField ?? true} data-testid="username" placeholder={t("users.placeholder.username")} hint={t("users.hint.username")}>
                     {t("editUser.labels.username")}
                 </Form.ValidatedTextInput>

docs/gui/documentation_en.md

@@ -267,10 +267,10 @@ The columns describe the following information:
 * **username** - username of the account
    * If the specified username already exists, this account will be updated with the specified information and no new account will be created.
    * Cannot be changed after an account has been created
-**displayname** - Display name of the account
-**givenname** - First name of the user
-**surname** - Last name of the user
-**mail** - Mail address of the user
+* **displayname** - Display name of the account
+* **givenname** - First name of the user
+* **surname** - Last name of the user
+* **mail** - Mail address of the user
 * **pwdReset** - Indicates whether the password must be reset at the next login
   * Specified using *false* or *true*, where *true* indicates that the password must be reset at the next login
    * For newly created accounts, *pwdReset* is always automatically set to *true

dogu.json

@@ -1,6 +1,6 @@
 {
   "Name": "official/usermgt",
-  "Version": "1.17.0-1",
+  "Version": "1.17.1-1",
   "DisplayName": "User Management",
   "Description": "User and Group Management.",
   "Category": "Administration Apps",