From fed1cec1a71ec00ee4e211c3ab19a6651ced66b9 Mon Sep 17 00:00:00 2001 From: Elsio Sanchez <45974454+elsiosanchez@users.noreply.github.com> Date: Tue, 11 May 2021 17:42:12 -0400 Subject: [PATCH] Fix Record Access (#832) * Fix Record Access * correct observation Co-authored-by: elsiosanchez --- .../ADempiere/ContextMenu/contextMenuMobile.vue | 9 ++++++++- .../ADempiere/RecordAccess/recordAccessMobile.vue | 4 ---- src/components/ADempiere/RightPanel/index.vue | 13 ++++++++++++- src/store/modules/ADempiere/contextMenu.js | 9 ++++++--- src/views/ADempiere/Window/windowLogicComponent.js | 4 ++++ 5 files changed, 30 insertions(+), 9 deletions(-) diff --git a/src/components/ADempiere/ContextMenu/contextMenuMobile.vue b/src/components/ADempiere/ContextMenu/contextMenuMobile.vue index ed4d6a82..09caed06 100644 --- a/src/components/ADempiere/ContextMenu/contextMenuMobile.vue +++ b/src/components/ADempiere/ContextMenu/contextMenuMobile.vue @@ -243,8 +243,15 @@ export default { } else if (action === 'shareLink') { this.setShareLink() } else if (action.action === 'recordAccess') { - this.$store.commit('changeShowRigthPanel', true) + this.$store.commit('changeShowRigthPanel', false) this.$store.commit('setRecordAccess', true) + this.$router.push({ + name: this.$route.name, + query: { + ...this.$route.query, + typeAction: action.action + } + }, () => {}) } else { this.runAction(action) } diff --git a/src/components/ADempiere/RecordAccess/recordAccessMobile.vue b/src/components/ADempiere/RecordAccess/recordAccessMobile.vue index 6756a267..73415bae 100644 --- a/src/components/ADempiere/RecordAccess/recordAccessMobile.vue +++ b/src/components/ADempiere/RecordAccess/recordAccessMobile.vue @@ -349,10 +349,6 @@ export default { } }, SendRecorAccess(list) { - // list.forEach(element => { - // element.isReadOnly = this.isReadonly - // element.isDependentEntities = this.isDependentEntities - // }) this.saveRecordAccess(list) } } diff --git a/src/components/ADempiere/RightPanel/index.vue b/src/components/ADempiere/RightPanel/index.vue index 9549a0c4..2dbbc8dd 100644 --- a/src/components/ADempiere/RightPanel/index.vue +++ b/src/components/ADempiere/RightPanel/index.vue @@ -28,7 +28,7 @@
@@ -108,6 +108,17 @@ export default { window.removeEventListener('click', this.closeSidebar) } }, + closePanel() { + this.$router.push({ + name: this.$route.name, + query: { + ...this.$route.query, + typeAction: '' + } + }, () => {}) + this.$store.commit('changeShowRigthPanel', false) + this.isShowRightPanel = !this.isShowRightPanel + }, insertToBody() { const elx = this.$refs.rightMenu const body = document.querySelector('body') diff --git a/src/store/modules/ADempiere/contextMenu.js b/src/store/modules/ADempiere/contextMenu.js index d18aef73..00febe3f 100644 --- a/src/store/modules/ADempiere/contextMenu.js +++ b/src/store/modules/ADempiere/contextMenu.js @@ -1,4 +1,4 @@ -import { recursiveTreeSearch } from '@/utils/ADempiere/valueUtils.js' +import { isEmptyValue, recursiveTreeSearch } from '@/utils/ADempiere/valueUtils.js' import { requestListDocumentActions, requestListDocumentStatuses } from '@/api/ADempiere/window' // Store used for set all related to context menu @@ -50,8 +50,11 @@ const contextMenu = { addlistDocumentStatus(state, payload) { state.listDocumentStatus = payload }, - changeShowRigthPanel(state) { - state.isShowRightPanel = !state.isShowRightPanel + changeShowRigthPanel(state, params) { + if (isEmptyValue(params)) { + state.isShowRightPanel = !state.isShowRightPanel + } + state.isShowRightPanel = params }, changeShowPopoverField(state) { state.isShowPopoverField = !state.isShowPopoverField diff --git a/src/views/ADempiere/Window/windowLogicComponent.js b/src/views/ADempiere/Window/windowLogicComponent.js index 4bdfd44f..9a1efee6 100644 --- a/src/views/ADempiere/Window/windowLogicComponent.js +++ b/src/views/ADempiere/Window/windowLogicComponent.js @@ -117,6 +117,10 @@ export default { return component }, showRecordAccess() { + if (this.$route.query.typeAction === 'recordAccess') { + this.$store.commit('changeShowRigthPanel', true) + return true + } return this.$store.getters.getShowRecordAccess }, isNewRecord() {