Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-02 19:45:51 +01:00
Code Issues Packages Projects Releases Activity

Merged changes

Browse Source
This commit is contained in:
Philipp Czora
2018-09-19 17:19:48 +02:00
parent 57a4e42da6 ba8ce698e1
commit 11c1497ace
12 changed files with 164 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scm-ui/src/repos/containers/Changesets.js
View File

@@ -22,7 +22,7 @@ import {
getBranchNames
} from "../../repos/modules/branches";
import type { PagedCollection, Repository } from "@scm-manager/ui-types";
import ChangesetTable from "../components/ChangesetTable";
import ChangesetList from "../components/ChangesetList";
import DropDown from "../components/DropDown";
import { withRouter } from "react-router-dom";
@@ -84,7 +84,7 @@ class Changesets extends React.Component<State, Props> {
renderTable = () => {
const branch = this.props.match.params.branch;
const { changesets, branchNames } = this.props;
const { repository, changesets, branchNames } = this.props;
if (branchNames && branchNames.length > 0) {
return (
@@ -95,12 +95,12 @@ class Changesets extends React.Component<State, Props> {
preselectedOption={branch}
optionSelected={branch => this.branchChanged(branch)}
/>
<ChangesetTable changesets={changesets} />
<ChangesetList repository={repository} changesets={changesets} />
</div>
);
}
return <ChangesetTable changesets={changesets} />;
return <ChangesetList changesets={changesets} />;
};
renderPaginator() {