From 3102af3029de205dff92c8c5f85d5e9eae455475 Mon Sep 17 00:00:00 2001 From: Florian Scholdei Date: Wed, 24 Apr 2019 09:59:29 +0200 Subject: [PATCH] renamed add to create --- .../ui-components/src/OverviewPageActions.js | 6 ++---- scm-ui/public/locales/de/users.json | 2 +- scm-ui/public/locales/en/users.json | 2 +- scm-ui/src/containers/Main.js | 12 ++++++------ .../containers/{AddGroup.js => CreateGroup.js} | 4 ++-- scm-ui/src/groups/containers/Groups.js | 4 ++-- scm-ui/src/repos/containers/Overview.js | 2 +- .../users/containers/{AddUser.js => CreateUser.js} | 8 ++++---- scm-ui/src/users/containers/Users.js | 6 ++++-- 9 files changed, 23 insertions(+), 23 deletions(-) rename scm-ui/src/groups/containers/{AddGroup.js => CreateGroup.js} (96%) rename scm-ui/src/users/containers/{AddUser.js => CreateUser.js} (91%) diff --git a/scm-ui-components/packages/ui-components/src/OverviewPageActions.js b/scm-ui-components/packages/ui-components/src/OverviewPageActions.js index 972560fb1a..84d0713752 100644 --- a/scm-ui-components/packages/ui-components/src/OverviewPageActions.js +++ b/scm-ui-components/packages/ui-components/src/OverviewPageActions.js @@ -4,7 +4,6 @@ import type { History } from "history"; import { withRouter } from "react-router-dom"; import classNames from "classnames"; import injectSheet from "react-jss"; -import { PageActions } from "./layout"; import { FilterInput } from "./forms"; import { Button, urls } from "./index"; @@ -30,13 +29,12 @@ const styles = { class OverviewPageActions extends React.Component { render() { const { history, location, link } = this.props; - let directory = link.substring(0, link.indexOf("/")); return ( <> { - history.push(`/${directory}/?q=${filter}`); + history.push(`/${link}/?q=${filter}`); }} /> {this.renderCreateButton()} @@ -49,7 +47,7 @@ class OverviewPageActions extends React.Component { if (showCreateButton) { return (
-
); } diff --git a/scm-ui/public/locales/de/users.json b/scm-ui/public/locales/de/users.json index 05b5cf142f..37416c1e4f 100644 --- a/scm-ui/public/locales/de/users.json +++ b/scm-ui/public/locales/de/users.json @@ -39,7 +39,7 @@ "setPermissionsNavLink": "Berechtigungen" } }, - "addUser": { + "createUser": { "title": "Benutzer erstellen", "subtitle": "Erstellen eines neuen Benutzers" }, diff --git a/scm-ui/public/locales/en/users.json b/scm-ui/public/locales/en/users.json index e6fd822ead..d188f6221b 100644 --- a/scm-ui/public/locales/en/users.json +++ b/scm-ui/public/locales/en/users.json @@ -39,7 +39,7 @@ "setPermissionsNavLink": "Permissions" } }, - "addUser": { + "createUser": { "title": "Create User", "subtitle": "Create a new user" }, diff --git a/scm-ui/src/containers/Main.js b/scm-ui/src/containers/Main.js index 48debaf5b8..42a6c54590 100644 --- a/scm-ui/src/containers/Main.js +++ b/scm-ui/src/containers/Main.js @@ -12,14 +12,14 @@ import Logout from "../containers/Logout"; import { ProtectedRoute } from "@scm-manager/ui-components"; import { binder, ExtensionPoint } from "@scm-manager/ui-extensions"; -import AddUser from "../users/containers/AddUser"; +import CreateUser from "../users/containers/CreateUser"; import SingleUser from "../users/containers/SingleUser"; import RepositoryRoot from "../repos/containers/RepositoryRoot"; import Create from "../repos/containers/Create"; import Groups from "../groups/containers/Groups"; import SingleGroup from "../groups/containers/SingleGroup"; -import AddGroup from "../groups/containers/AddGroup"; +import CreateGroup from "../groups/containers/CreateGroup"; import Config from "../config/containers/Config"; import Profile from "./Profile"; @@ -74,8 +74,8 @@ class Main extends React.Component { /> { /> { +class CreateGroup extends React.Component { componentDidMount() { this.props.resetForm(); } @@ -104,4 +104,4 @@ const mapStateToProps = state => { export default connect( mapStateToProps, mapDispatchToProps -)(translate("groups")(AddGroup)); +)(translate("groups")(CreateGroup)); diff --git a/scm-ui/src/groups/containers/Groups.js b/scm-ui/src/groups/containers/Groups.js index 535cc0867b..60672bf830 100644 --- a/scm-ui/src/groups/containers/Groups.js +++ b/scm-ui/src/groups/containers/Groups.js @@ -87,7 +87,7 @@ class Groups extends React.Component { @@ -118,7 +118,7 @@ class Groups extends React.Component { return ( ); } diff --git a/scm-ui/src/repos/containers/Overview.js b/scm-ui/src/repos/containers/Overview.js index 982b2c5d1e..9dcaf99b72 100644 --- a/scm-ui/src/repos/containers/Overview.js +++ b/scm-ui/src/repos/containers/Overview.js @@ -85,7 +85,7 @@ class Overview extends React.Component { diff --git a/scm-ui/src/users/containers/AddUser.js b/scm-ui/src/users/containers/CreateUser.js similarity index 91% rename from scm-ui/src/users/containers/AddUser.js rename to scm-ui/src/users/containers/CreateUser.js index 069df04187..dd2a0dac05 100644 --- a/scm-ui/src/users/containers/AddUser.js +++ b/scm-ui/src/users/containers/CreateUser.js @@ -28,7 +28,7 @@ type Props = { history: History }; -class AddUser extends React.Component { +class CreateUser extends React.Component { componentDidMount() { this.props.resetForm(); } @@ -49,8 +49,8 @@ class AddUser extends React.Component { return ( @@ -88,4 +88,4 @@ const mapStateToProps = (state, ownProps) => { export default connect( mapStateToProps, mapDispatchToProps -)(translate("users")(AddUser)); +)(translate("users")(CreateUser)); diff --git a/scm-ui/src/users/containers/Users.js b/scm-ui/src/users/containers/Users.js index cc9d2f5d16..7fd279bc45 100644 --- a/scm-ui/src/users/containers/Users.js +++ b/scm-ui/src/users/containers/Users.js @@ -87,7 +87,7 @@ class Users extends React.Component { @@ -115,7 +115,9 @@ class Users extends React.Component { renderCreateButton() { const { canAddUsers, t } = this.props; if (canAddUsers) { - return ; + return ( + + ); } return null; }