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

remove if else to show permission add option also in repos without any permissions

Browse Source
This commit is contained in:
Maren Süwer
2018-09-03 14:19:44 +02:00
parent 0acaca78b0
commit 1e68060a98
1 changed files with 27 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
scm-ui/src/permissions/containers/Permissions.js
View File

@@ -15,7 +15,6 @@ import {
import Loading from "../../components/Loading";
import ErrorPage from "../../components/ErrorPage";
import type {
Permission,
PermissionCollection,
PermissionEntry
} from "../types/Permissions";
@@ -70,6 +69,7 @@ class Permissions extends React.Component<Props> {
loadingCreatePermission,
hasPermissionToCreate
} = this.props;
console.log(permissions);
if (error) {
return (
@@ -98,36 +98,32 @@ class Permissions extends React.Component<Props> {
loading={loadingCreatePermission}
/>
) : null;
if (permissions.length > 0)
return (
<div>
<table className="table is-hoverable is-fullwidth">
<thead>
<tr>
<th>{t("permission.name")}</th>
<th className="is-hidden-mobile">{t("permission.type")}</th>
<th>{t("permission.group-permission")}</th>
</tr>
</thead>
<tbody>
{permissions.map((permission, index) => {
return (
<SinglePermission
key={index}
namespace={namespace}
repoName={repoName}
permission={permission}
/>
);
})}
</tbody>
</table>
{createPermissionForm}
</div>
);
return <div />;
return (
<div>
<table className="table is-hoverable is-fullwidth">
<thead>
<tr>
<th>{t("permission.name")}</th>
<th className="is-hidden-mobile">{t("permission.type")}</th>
<th>{t("permission.group-permission")}</th>
</tr>
</thead>
<tbody>
{permissions.map(permission => {
return (
<SinglePermission
key={permission.name}
namespace={namespace}
repoName={repoName}
permission={permission}
/>
);
})}
</tbody>
</table>
{createPermissionForm}
</div>
);
}
}
@@ -142,7 +138,6 @@ const mapStateToProps = (state, ownProps) => {
namespace,
repoName
);
console.log(permissions);
const hasPermissionToCreate = hasCreatePermission(state, namespace, repoName);
return {
namespace,