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

Fixed hiding of branch drop down when there are no branches

Browse Source
This commit is contained in:
Philipp Czora
2018-09-18 15:07:30 +02:00
parent 75767bde69
commit 732a84bb7c
3 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
scm-ui/src/changesets/containers/Changesets.js
View File

@@ -30,18 +30,19 @@ class Changesets extends React.Component<State, Props> {
componentDidMount() {
const {namespace, name} = this.props.repository;
const branchName = this.props.match.params.branch;
const {fetchChangesetsByNamespaceNameAndBranch, fetchChangesetsByNamespaceAndName, fetchBranchesByNamespaceAndName} = this.props;
if (branchName) {
this.props.fetchChangesetsByNamespaceNameAndBranch(namespace, name, branchName);
fetchChangesetsByNamespaceNameAndBranch(namespace, name, branchName);
} else {
this.props.fetchChangesetsByNamespaceAndName(namespace, name);
fetchChangesetsByNamespaceAndName(namespace, name);
}
this.props.fetchBranchesByNamespaceAndName(namespace, name);
fetchBranchesByNamespaceAndName(namespace, name);
}
render() {
const {changesets, loading, error} = this.props;
if (loading || !changesets) {
return <Loading/>
return <Loading />
}
return <div>
<ErrorNotification error={error}/>
@@ -54,9 +55,9 @@ class Changesets extends React.Component<State, Props> {
const branch = this.props.match.params.branch;
const {changesets, branchNames} = this.props;
if (branchNames) {
if (branchNames && branchNames.length > 0) {
return <div>
<DropDown options={branchNames} preselectedOption={branch}
<label className="label">Branch: </label><DropDown options={branchNames} preselectedOption={branch}
optionSelected={branch => this.branchChanged(branch)}/>
<ChangesetTable changesets={changesets}/>
</div>;