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

fixed preloading bug for sorting null branches

Browse Source
This commit is contained in:
Florian Scholdei
2019-03-29 14:54:18 +01:00
parent b7178d3332
commit e6912ef77b
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scm-ui/src/repos/branches/components/BranchRow.js
View File

@@ -14,7 +14,11 @@ export default class BranchRow extends React.Component<Props> {
if (defaultBranch) { if (defaultBranch) {
showLabel = <span className="tag is-dark">Default</span>; showLabel = <span className="tag is-dark">Default</span>;
} }
return <Link to={to}>{label} {showLabel}</Link>; return (
<Link to={to}>
{label} {showLabel}
</Link>
);
} }
render() { render() {

6
scm-ui/src/repos/branches/containers/BranchesOverview.js
View File

@@ -74,16 +74,16 @@ class BranchesOverview extends React.Component<Props> {
render() { render() {
const { baseUrl, loading, error, branches, t } = this.props; const { baseUrl, loading, error, branches, t } = this.props;
orderBranches(branches);
if (error) { if (error) {
return <ErrorNotification error={error} />; return <ErrorNotification error={error} />;
} }
if (loading) { if (!branches || loading) {
return <Loading />; return <Loading />;
} }
orderBranches(branches);
return ( return (
<> <>
<Subtitle subtitle={t("branches.overview.title")} /> <Subtitle subtitle={t("branches.overview.title")} />