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

renamed branches url

Browse Source
This commit is contained in:
Florian Scholdei
2019-03-28 10:16:19 +01:00
parent 58d2a03498
commit 9d43cc745f
2 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
scm-ui/src/repos/containers/RepositoryRoot.js
View File

@@ -12,7 +12,6 @@ import {Redirect, Route, Switch} from "react-router-dom";
import type { Repository } from "@scm-manager/ui-types";
import {
CollapsibleErrorPage,
Loading,
Navigation,
SubNavigation,
@@ -23,6 +22,7 @@ import {
import { translate } from "react-i18next";
import RepositoryDetails from "../components/RepositoryDetails";
import EditRepo from "./EditRepo";
import CreateBranch from "./CreateBranch";
import Permissions from "../permissions/containers/Permissions";
import type { History } from "history";
@@ -74,7 +74,7 @@ class RepositoryRoot extends React.Component<Props> {
matches = (route: any) => {
const url = this.matchedUrl();
const regex = new RegExp(`${url}(/branches)?/?[^/]*/changesets?.*`);
const regex = new RegExp(`${url}(/branch)?/?[^/]*/changesets?.*`);
return route.location.pathname.match(regex);
};
@@ -86,7 +86,7 @@ class RepositoryRoot extends React.Component<Props> {
title={t("repositoryRoot.errorTitle")}
subtitle={t("repositoryRoot.errorSubtitle")}
error={error}
/>
/>;
}
if (!repository || loading) {
@@ -156,21 +156,29 @@ class RepositoryRoot extends React.Component<Props> {
render={() => (
<BranchRoot
repository={repository}
baseUrlWithBranch={`${url}/branches`}
baseUrlWithBranch={`${url}/branch`}
baseUrlWithoutBranch={`${url}/changesets`}
/>
)}
/>
<Route
path={`${url}/branches/:branch/changesets`}
path={`${url}/branch/:branch/changesets`}
render={() => (
<BranchRoot
repository={repository}
baseUrlWithBranch={`${url}/branches`}
baseUrlWithBranch={`${url}/branch`}
baseUrlWithoutBranch={`${url}/changesets`}
/>
)}
/>
<Route
path={`${url}/branches/create`}
render={() => (
<CreateBranch
repository={repository}
/>
)}
/>
<ExtensionPoint
name="repository.route"
props={extensionProps}