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

fixed paging with NaN page numbers

Browse Source
This commit is contained in:
Sebastian Sdorra
2018-10-17 11:55:47 +02:00
parent 229a46c344
commit efb857150b
4 changed files with 58 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
scm-ui/src/repos/containers/BranchRoot.js
View File

@@ -6,7 +6,7 @@ import { Route, withRouter } from "react-router-dom";
import Changesets from "./Changesets";
import BranchSelector from "./BranchSelector";
import { connect } from "react-redux";
import { Loading } from "@scm-manager/ui-components";
import { ErrorNotification, Loading } from "@scm-manager/ui-components";
import {
fetchBranches,
getBranches,
@@ -25,6 +25,7 @@ type Props = {
// State props
branches: Branch[],
loading: boolean,
error: Error,
// Dispatch props
fetchBranches: Repository => void,
@@ -69,17 +70,21 @@ class BranchRoot extends React.Component<Props> {
};
render() {
// TODO error???
const { repository, loading, match, branches } = this.props;
const url = this.stripEndingSlash(match.url);
const { repository, error, loading, match, branches } = this.props;
if (error) {
return <ErrorNotification error={error} />;
}
if (loading) {
return <Loading />;
}
if (!repository || !branches) {
return null;
}
const url = this.stripEndingSlash(match.url);
const branch = this.findSelectedBranch();
const changesets = <Changesets repository={repository} branch={branch} />;