yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-09 14:51:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix conflicts

Browse Source
This commit is contained in:
Mark Kaylor 2021-09-13 09:06:48 +02:00
parent 60f1700295
commit 958bba7d19
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/plugins/users-permissions/admin/src/pages/Roles/ListPage/index.js
View File

@ -132,12 +132,7 @@ const RoleListPage = () => {
</CheckPermissions> </CheckPermissions>
} }
/> />
<ContentLayout>
<ContentLayout
canRead={canRead}
shouldShowEmptyState={roles && !roles.length}
isLoading={isLoading || isLoadingForPermissions}
>
<Box paddingBottom={4}> <Box paddingBottom={4}>
<Row style={{ flexWrap: 'wrap' }}> <Row style={{ flexWrap: 'wrap' }}>
<Search /> <Search />
@ -145,7 +140,7 @@ const RoleListPage = () => {
</Box> </Box>
{!canRead && <NoPermissions />} {!canRead && <NoPermissions />}
{(isLoading || isLoadingForPermissions) && <LoadingIndicatorPage />} {(isLoading || isLoadingForPermissions) && <LoadingIndicatorPage />}
{canRead && roles && roles.length ? ( {canRead && roles && sortedRoles?.length ? (
<Table colCount={colCount} rowCount={rowCount}> <Table colCount={colCount} rowCount={rowCount}>
<Thead> <Thead>
<Tr> <Tr>