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

fix endless loop, by using the same reference for the branch array

Browse Source
This commit is contained in:
Sebastian Sdorra
2018-10-17 10:06:26 +02:00
parent f215fc4117
commit d330975557
6 changed files with 90 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,16 +1,29 @@
//@flow
import React from "react";
import {deleteRepo, fetchRepo, getFetchRepoFailure, getRepository, isFetchRepoPending} from "../modules/repos";
import {connect} from "react-redux";
import {Route, Switch} from "react-router-dom";
import type {Repository} from "@scm-manager/ui-types";
import {ErrorPage, Loading, Navigation, NavLink, Page, Section} from "@scm-manager/ui-components";
import {translate} from "react-i18next";
import {
deleteRepo,
fetchRepo,
getFetchRepoFailure,
getRepository,
isFetchRepoPending
} from "../modules/repos";
import { connect } from "react-redux";
import { Route, Switch } from "react-router-dom";
import type { Repository } from "@scm-manager/ui-types";
import {
ErrorPage,
Loading,
Navigation,
NavLink,
Page,
Section
} from "@scm-manager/ui-components";
import { translate } from "react-i18next";
import RepositoryDetails from "../components/RepositoryDetails";
import DeleteNavAction from "../components/DeleteNavAction";
import Edit from "../containers/Edit";
import type {History} from "history";
import type { History } from "history";
import EditNavLink from "../components/EditNavLink";
import BranchRoot from "./BranchRoot";
@@ -98,9 +111,8 @@ class RepositoryRoot extends React.Component<Props> {
path={`${url}/edit`}
component={() => <Edit repository={repository} />}
/>
<Route
path={`${url}/branches/:branch`}
path={`${url}/branches/:branch/changesets`}
render={() => (
<BranchRoot
repository={repository}
@@ -116,7 +128,7 @@ class RepositoryRoot extends React.Component<Props> {
<NavLink to={url} label={t("repository-root.information")} />
<NavLink
activeOnlyWhenExact={false}
to={`${url}/changesets/`}
to={`${url}/branches/master/changesets/1`}
label={t("repository-root.history")}
activeWhenMatch={this.matches}
/>