fix(next, ui): respect access of user for document locking (#9139)
This commit is contained in:
@@ -98,8 +98,7 @@ export const Account: React.FC<AdminViewProps> = async ({
|
||||
id: user.id,
|
||||
collectionConfig,
|
||||
isEditing: true,
|
||||
payload: req.payload,
|
||||
user,
|
||||
req,
|
||||
})
|
||||
|
||||
// Get all versions required for UI
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import type {
|
||||
Payload,
|
||||
PayloadRequest,
|
||||
SanitizedCollectionConfig,
|
||||
SanitizedGlobalConfig,
|
||||
TypedUser,
|
||||
@@ -11,8 +11,7 @@ type Args = {
|
||||
globalConfig?: SanitizedGlobalConfig
|
||||
id?: number | string
|
||||
isEditing: boolean
|
||||
payload: Payload
|
||||
user: TypedUser
|
||||
req: PayloadRequest
|
||||
}
|
||||
|
||||
type Result = Promise<{
|
||||
@@ -26,8 +25,7 @@ export const getIsLocked = async ({
|
||||
collectionConfig,
|
||||
globalConfig,
|
||||
isEditing,
|
||||
payload,
|
||||
user,
|
||||
req,
|
||||
}: Args): Result => {
|
||||
const entityConfig = collectionConfig || globalConfig
|
||||
|
||||
@@ -61,9 +59,11 @@ export const getIsLocked = async ({
|
||||
]
|
||||
}
|
||||
|
||||
const { docs } = await payload.find({
|
||||
const { docs } = await req.payload.find({
|
||||
collection: 'payload-locked-documents',
|
||||
depth: 1,
|
||||
overrideAccess: false,
|
||||
req,
|
||||
where,
|
||||
})
|
||||
|
||||
@@ -71,7 +71,7 @@ export const getIsLocked = async ({
|
||||
const newEditor = docs[0].user?.value
|
||||
const lastUpdateTime = new Date(docs[0].updatedAt).getTime()
|
||||
|
||||
if (newEditor?.id !== user.id) {
|
||||
if (newEditor?.id !== req.user.id) {
|
||||
return {
|
||||
currentEditor: newEditor,
|
||||
isLocked: true,
|
||||
|
||||
@@ -126,8 +126,7 @@ export const renderDocument = async ({
|
||||
collectionConfig,
|
||||
globalConfig,
|
||||
isEditing,
|
||||
payload: req.payload,
|
||||
user,
|
||||
req,
|
||||
}),
|
||||
])
|
||||
|
||||
|
||||
@@ -61,7 +61,9 @@ export const handleFormStateLocking = async ({
|
||||
collection: 'payload-locked-documents',
|
||||
depth: 1,
|
||||
limit: 1,
|
||||
overrideAccess: false,
|
||||
pagination: false,
|
||||
req,
|
||||
where: lockedDocumentQuery,
|
||||
})
|
||||
|
||||
|
||||
Reference in New Issue
Block a user