Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-10 07:25:44 +01:00
Code Issues Packages Projects Releases Activity

Merge heads

Browse Source
This commit is contained in:
Philipp Czora
2018-07-25 16:43:40 +02:00
parent d0c8b66459 ea0aeb9706
commit 4c788f18fb
2 changed files with 42 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Jenkinsfile vendored
View File

@@ -1,7 +1,7 @@
#!groovy #!groovy
// Keep the version in sync with the one used in pom.xml in order to get correct syntax completion. // Keep the version in sync with the one used in pom.xml in order to get correct syntax completion.
@Library('github.com/cloudogu/ces-build-lib@9aadeeb') @Library('github.com/cloudogu/ces-build-lib@59d3e94')
import com.cloudogu.ces.cesbuildlib.* import com.cloudogu.ces.cesbuildlib.*
node() { // No specific label node() { // No specific label

83
scm-ui/src/users/components/UserForm.js
View File

@@ -9,7 +9,6 @@ import Loading from "../../components/Loading";
type Props = { type Props = {
submitForm: User => void, submitForm: User => void,
user?: User, user?: User,
loading?: boolean,
t: string => string t: string => string
}; };
@@ -39,49 +38,49 @@ class UserForm extends React.Component<Props, User> {
render() { render() {
const { t } = this.props; const { t } = this.props;
const user = this.state; const user = this.state;
if (user) {
return ( let nameField = null;
<form onSubmit={this.submit}> if (!this.props.user) {
<InputField nameField = (
label={t("user.name")} <InputField
onChange={this.handleUsernameChange} label={t("user.name")}
value={user ? 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>
); );
} 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) => { handleUsernameChange = (name: string) => {