fixes merge conflict with commit 9a44d02

(do not allow change username field on edit)
This commit is contained in:
Christoph Wolfes
2018-07-25 15:37:00 +02:00
parent d1bbb6a14f
commit 84a4e519df

View File

@@ -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) => {