From 8425f1c965a189c50f7f0be268f8473453e870b2 Mon Sep 17 00:00:00 2001 From: Leonel Matos Date: Mon, 20 Jan 2020 16:03:16 -0400 Subject: [PATCH] add validation to personal lock by role (#226) Co-authored-by: EdwinBetanc0urt --- src/components/ADempiere/ContextMenu/contextMenuMixin.js | 3 +++ src/store/modules/ADempiere/data.js | 2 +- src/store/modules/user.js | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/components/ADempiere/ContextMenu/contextMenuMixin.js b/src/components/ADempiere/ContextMenu/contextMenuMixin.js index 4223e7f7..5d81d715 100644 --- a/src/components/ADempiere/ContextMenu/contextMenuMixin.js +++ b/src/components/ADempiere/ContextMenu/contextMenuMixin.js @@ -161,6 +161,9 @@ export const contextMixin = { }, metadataReport() { return this.$store.getters.getCachedReport(this.$route.params.instanceUuid) + }, + isPersonalLock() { + return this.$store.getters['user/getIsPersonalLock'] } }, watch: { diff --git a/src/store/modules/ADempiere/data.js b/src/store/modules/ADempiere/data.js index 500e5649..9bf78710 100644 --- a/src/store/modules/ADempiere/data.js +++ b/src/store/modules/ADempiere/data.js @@ -778,7 +778,7 @@ const data = { userUuid }) .then(privateAccessResponse => { - if (isEmptyValue(privateAccessResponse.recordId)) { + if (isEmptyValue(privateAccessResponse.recordId) || privateAccessResponse !== recordId) { return { isLocked: false, tableName, diff --git a/src/store/modules/user.js b/src/store/modules/user.js index a5a6b1ea..7f482af0 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -267,6 +267,9 @@ const getters = { }, getUserUuid: (state) => { return state.userUuid + }, + getIsPersonalLock: (state) => { + return state.rol.isPersonalLock } }