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

corrected subtitle in create/edit

Browse Source
This commit is contained in:
Florian Scholdei
2019-01-23 14:48:29 +01:00
parent 0b4c7148e9
commit 4b24c8db06
3 changed files with 50 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
scm-ui/src/groups/components/GroupForm.js
View File

@@ -72,12 +72,13 @@ class GroupForm extends React.Component<Props, State> {
}; };
render() { render() {
const { t, loading } = this.props; const { loading, t } = this.props;
const { group } = this.state; const { group } = this.state;
let firstField = null; let nameField = null;
let subtitle = null;
if (!this.props.group) { if (!this.props.group) {
// create new group // create new group
firstField = ( nameField = (
<InputField <InputField
label={t("group.name")} label={t("group.name")}
errorMessage={t("groupForm.nameError")} errorMessage={t("groupForm.nameError")}
@@ -89,46 +90,49 @@ class GroupForm extends React.Component<Props, State> {
); );
} else { } else {
// edit existing group // edit existing group
firstField = <Subtitle subtitle={t("groupForm.subtitle")} />; subtitle = <Subtitle subtitle={t("groupForm.subtitle")} />;
} }
return ( return (
<form onSubmit={this.submit}> <>
{firstField} {subtitle}
<Textarea <form onSubmit={this.submit}>
label={t("group.description")} {nameField}
errorMessage={t("groupForm.descriptionError")} <Textarea
onChange={this.handleDescriptionChange} label={t("group.description")}
value={group.description} errorMessage={t("groupForm.descriptionError")}
validationError={false} onChange={this.handleDescriptionChange}
helpText={t("groupForm.help.descriptionHelpText")} value={group.description}
/> validationError={false}
<LabelWithHelpIcon helpText={t("groupForm.help.descriptionHelpText")}
label={t("group.members")} />
helpText={t("groupForm.help.memberHelpText")} <LabelWithHelpIcon
/> label={t("group.members")}
<MemberNameTable helpText={t("groupForm.help.memberHelpText")}
members={group.members} />
memberListChanged={this.memberListChanged} <MemberNameTable
/> members={group.members}
memberListChanged={this.memberListChanged}
/>
<AutocompleteAddEntryToTableField <AutocompleteAddEntryToTableField
addEntry={this.addMember} addEntry={this.addMember}
disabled={false} disabled={false}
buttonLabel={t("add-member-button.label")} buttonLabel={t("add-member-button.label")}
fieldLabel={t("add-member-textfield.label")} fieldLabel={t("add-member-textfield.label")}
errorMessage={t("add-member-textfield.error")} errorMessage={t("add-member-textfield.error")}
loadSuggestions={this.props.loadUserSuggestions} loadSuggestions={this.props.loadUserSuggestions}
placeholder={t("add-member-autocomplete.placeholder")} placeholder={t("add-member-autocomplete.placeholder")}
loadingMessage={t("add-member-autocomplete.loading")} loadingMessage={t("add-member-autocomplete.loading")}
noOptionsMessage={t("add-member-autocomplete.no-options")} noOptionsMessage={t("add-member-autocomplete.no-options")}
/> />
<SubmitButton <SubmitButton
disabled={!this.isValid()} disabled={!this.isValid()}
label={t("groupForm.submit")} label={t("groupForm.submit")}
loading={loading} loading={loading}
/> />
</form> </form>
</>
); );
} }

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

@@ -88,7 +88,9 @@ class UserForm extends React.Component<Props, State> {
let nameField = null; let nameField = null;
let passwordChangeField = null; let passwordChangeField = null;
let subtitle = null;
if (!this.props.user) { if (!this.props.user) {
// create new user
nameField = ( nameField = (
<InputField <InputField
label={t("user.name")} label={t("user.name")}
@@ -103,10 +105,13 @@ class UserForm extends React.Component<Props, State> {
passwordChangeField = ( passwordChangeField = (
<PasswordConfirmation passwordChanged={this.handlePasswordChange} /> <PasswordConfirmation passwordChanged={this.handlePasswordChange} />
); );
} else {
// edit existing user
subtitle = <Subtitle subtitle={t("userForm.subtitle")} />;
} }
return ( return (
<> <>
<Subtitle subtitle={t("userForm.subtitle")} /> {subtitle}
<form onSubmit={this.submit}> <form onSubmit={this.submit}>
<div className="columns"> <div className="columns">
<div className="column is-half"> <div className="column is-half">

2
scm-ui/src/users/containers/SingleUser.js
View File

@@ -92,7 +92,7 @@ class SingleUser extends React.Component<Props> {
component={() => <SetUserPassword user={user} />} component={() => <SetUserPassword user={user} />}
/> />
<Route <Route
path={`${url}/permissions`} path={`${url}/settings/permissions`}
component={() => ( component={() => (
<SetPermissions <SetPermissions
selectedPermissionsLink={user._links.permissions} selectedPermissionsLink={user._links.permissions}