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

Use transmitted branch name

Browse Source
This commit is contained in:
René Pfeuffer
2019-04-04 13:03:51 +02:00
parent f606c10cfb
commit 03e25086a7
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
scm-ui/src/repos/branches/containers/CreateBranch.js
View File

@@ -56,7 +56,7 @@ class CreateBranch extends React.Component<Props> {
this.props.createBranch(branch, () => this.branchCreated(branch));
};
matchesTransmittedName = (url: string) => {
transmittedName = (url: string) => {
const params = queryString.parse(url);
return params.name;
};
@@ -68,7 +68,7 @@ class CreateBranch extends React.Component<Props> {
return <ErrorNotification error={error} />;
}
if (!branches) {
if (loading || !branches) {
return <Loading />;
}
@@ -80,7 +80,7 @@ class CreateBranch extends React.Component<Props> {
loading={loading}
repository={repository}
branches={branches}
transmittedName={this.matchesTransmittedName(location.search)}
transmittedName={this.transmittedName(location.search)}
/>
</>
);
@@ -107,8 +107,7 @@ const mapDispatchToProps = dispatch => {
const mapStateToProps = (state, ownProps) => {
const { repository } = ownProps;
const loading =
isFetchBranchesPending(state, repository) || isCreateBranchPending(state);
const loading = isFetchBranchesPending(state, repository); //|| isCreateBranchPending(state);
const error =
getFetchBranchesFailure(state, repository) || getCreateBranchFailure(state);
const branches = getBranches(state, repository);