github/directus
1
0
Fork 0
mirror of https://github.com/directus/directus.git synced 2026-02-06 03:25:04 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix revisions permissions check for admin users

Browse Source 
Fixes #4114
This commit is contained in:
rijkvanzanten
2021-02-17 10:32:49 -05:00
parent 06cd0bdbe2
commit 07ea3870ba
4 changed files with 22 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/modules/users/routes/item.vue
View File

@@ -151,7 +151,7 @@
<template #sidebar>
<user-info-sidebar-detail :is-new="isNew" :user="item" />
<revisions-drawer-detail
v-if="isBatch === false && isNew === false && hasRevisionsPermissions"
v-if="isBatch === false && isNew === false && revisionsAllowed"
collection="directus_users"
:primary-key="primaryKey"
ref="revisionsDrawerDetail"
@@ -176,7 +176,7 @@ import CommentsSidebarDetail from '@/views/private/components/comments-sidebar-d
import useItem from '@/composables/use-item';
import SaveOptions from '@/views/private/components/save-options';
import api from '@/api';
import { useFieldsStore, useCollectionsStore, useUserStore } from '@/stores/';
import { useFieldsStore, useCollectionsStore } from '@/stores/';
import useFormFields from '@/composables/use-form-fields';
import { Field } from '@/types';
import UserInfoSidebarDetail from '../components/user-info-sidebar-detail.vue';
@@ -187,7 +187,6 @@ import { userName } from '@/utils/user-name';
import { usePermissions } from '@/composables/use-permissions';
import { unexpectedError } from '@/utils/unexpected-error';
import { addTokenToURL } from '@/api';
import { usePermissionsStore } from '@/stores';
export default defineComponent({
name: 'users-item',
@@ -218,14 +217,6 @@ export default defineComponent({
const form = ref<HTMLElement>();
const fieldsStore = useFieldsStore();
const collectionsStore = useCollectionsStore();
const userStore = useUserStore();
const permissionsStore = usePermissionsStore();
const hasRevisionsPermissions = computed(() => {
return !!permissionsStore.state.permissions.find(
(permission) => permission.collection === 'directus_revisions' && permission.action === 'read'
);
});
const { primaryKey } = toRefs(props);
const { breadcrumb } = useBreadcrumb();
@@ -299,7 +290,7 @@ export default defineComponent({
const { formFields } = useFormFields(fieldsFiltered);
const { deleteAllowed, archiveAllowed, saveAllowed, updateAllowed } = usePermissions(
const { deleteAllowed, archiveAllowed, saveAllowed, updateAllowed, revisionsAllowed } = usePermissions(
ref('directus_users'),
item,
isNew
@@ -351,7 +342,7 @@ export default defineComponent({
archiveTooltip,
form,
userName,
hasRevisionsPermissions,
revisionsAllowed,
};
function useBreadcrumb() {