From 84a4e519df9a6d136a746c5dd4718fe2dd04b721 Mon Sep 17 00:00:00 2001
From: Christoph Wolfes <christoph.wolfes@cloudogu.com>
Date: Wed, 25 Jul 2018 15:37:00 +0200
Subject: [PATCH] fixes merge conflict with commit 9a44d02 (do not allow change
 username field on edit)

---
 scm-ui/src/users/components/UserForm.js | 83 ++++++++++++-------------
 1 file changed, 41 insertions(+), 42 deletions(-)

diff --git a/scm-ui/src/users/components/UserForm.js b/scm-ui/src/users/components/UserForm.js
index b93877e0e3..40ecf4504a 100644
--- a/scm-ui/src/users/components/UserForm.js
+++ b/scm-ui/src/users/components/UserForm.js
@@ -9,7 +9,6 @@ import Loading from "../../components/Loading";
 type Props = {
   submitForm: User => void,
   user?: User,
-  loading?: boolean,
   t: string => string
 };
 
@@ -39,49 +38,49 @@ class UserForm extends React.Component<Props, User> {
   render() {
     const { t } = this.props;
     const user = this.state;
-    if (user) {
-      return (
-        <form onSubmit={this.submit}>
-          <InputField
-            label={t("user.name")}
-            onChange={this.handleUsernameChange}
-            value={user ? user.name : ""}
-          />
-          <InputField
-            label={t("user.displayName")}
-            onChange={this.handleDisplayNameChange}
-            value={user ? user.displayName : ""}
-          />
-          <InputField
-            label={t("user.mail")}
-            onChange={this.handleEmailChange}
-            value={user ? user.mail : ""}
-          />
-          <InputField
-            label={t("user.password")}
-            type="password"
-            onChange={this.handlePasswordChange}
-            value={user ? user.password : ""}
-          />
-          <Checkbox
-            label={t("user.admin")}
-            onChange={this.handleAdminChange}
-            checked={user ? user.admin : false}
-          />
-          <Checkbox
-            label={t("user.active")}
-            onChange={this.handleActiveChange}
-            checked={user ? user.active : false}
-          />
-          <SubmitButton
-            label={t("user-form.submit")}
-            loading={this.props.loading}
-          />
-        </form>
+
+    let nameField = null;
+    if (!this.props.user) {
+      nameField = (
+        <InputField
+          label={t("user.name")}
+          onChange={this.handleUsernameChange}
+          value={user ? user.name : ""}
+        />
       );
-    } else {
-      return <Loading />;
     }
+    return (
+      <form onSubmit={this.submit}>
+        {nameField}
+        <InputField
+          label={t("user.displayName")}
+          onChange={this.handleDisplayNameChange}
+          value={user ? user.displayName : ""}
+        />
+        <InputField
+          label={t("user.mail")}
+          onChange={this.handleEmailChange}
+          value={user ? user.mail : ""}
+        />
+        <InputField
+          label={t("user.password")}
+          type="password"
+          onChange={this.handlePasswordChange}
+          value={user ? user.password : ""}
+        />
+        <Checkbox
+          label={t("user.admin")}
+          onChange={this.handleAdminChange}
+          checked={user ? user.admin : false}
+        />
+        <Checkbox
+          label={t("user.active")}
+          onChange={this.handleActiveChange}
+          checked={user ? user.active : false}
+        />
+        <SubmitButton label={t("user-form.submit")} />
+      </form>
+    );
   }
 
   handleUsernameChange = (name: string) => {