added baseUrl for info link

This commit is contained in:
Florian Scholdei
2019-05-09 15:11:55 +02:00
parent 7db1e4aad0
commit b8d73b91ea
4 changed files with 24 additions and 15 deletions

View File

@@ -51,7 +51,11 @@ class Config extends React.Component<Props> {
<Route
path={`${url}/roles`}
exact
component={GlobalPermissionRoles}
render={() => (
<GlobalPermissionRoles
baseUrl={`${url}/roles`}
/>
)}
/>
<ExtensionPoint
name="config.route"

View File

@@ -1,6 +1,7 @@
// @flow
import React from "react";
import { connect } from "react-redux";
import {withRouter} from "react-router-dom";
import { translate } from "react-i18next";
import type { History } from "history";
import type { Role, PagedCollection } from "@scm-manager/ui-types";
@@ -22,8 +23,8 @@ import {
} from "@scm-manager/ui-components";
import PermissionRoleTable from "../components/table/PermissionRoleTable";
import { getRolesLink } from "../../modules/indexResource";
type Props = {
baseUrl: string,
roles: Role[],
loading: boolean,
error: Error,
@@ -63,11 +64,11 @@ class GlobalPermissionRoles extends React.Component<Props> {
}
renderPermissionsTable() {
const { roles, list, page, t } = this.props;
const { baseUrl, roles, list, page, t } = this.props;
if (roles && roles.length > 0) {
return (
<>
<PermissionRoleTable roles={roles} />
<PermissionRoleTable baseUrl={baseUrl} roles={roles} />
<LinkPaginator collection={list} page={page} />
</>
);
@@ -115,7 +116,7 @@ const mapDispatchToProps = dispatch => {
};
};
export default connect(
export default withRouter(connect(
mapStateToProps,
mapDispatchToProps
)(translate("config")(GlobalPermissionRoles));
)(translate("config")(GlobalPermissionRoles)));