Browse Source

Merge pull request #1823 from nocodb/fix/editor-acl

fix: editor ACL
pull/1825/head
աɨռɢӄաօռɢ 3 years ago committed by GitHub
parent
commit
1d5d0f0b48
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      packages/nc-gui/components/project/spreadsheet/components/moreActions.vue
  2. 4
      packages/nc-gui/helpers/rolePermissionsEE.js
  3. 5
      scripts/cypress/integration/spec/roleValidation.spec.js

4
packages/nc-gui/components/project/spreadsheet/components/moreActions.vue

@ -63,7 +63,7 @@
</v-list-item-title>
</v-list-item>
<v-list-item
v-if="_isUIAllowed('csvImport') && !isView"
v-if="_isUIAllowed('SharedViewList') && !isView"
v-t="['a:actions:shared-view-list']"
dense
@click="$emit('showAdditionalFeatOverlay', 'shared-views')"
@ -79,7 +79,7 @@
</v-list-item-title>
</v-list-item>
<v-list-item
v-if="_isUIAllowed('csvImport') && !isView"
v-if="_isUIAllowed('webhook') && !isView"
v-t="['c:actions:webhook']"
dense
@click="$emit('webhook')"

4
packages/nc-gui/helpers/rolePermissionsEE.js

@ -13,7 +13,8 @@ export default {
sortSync: true,
fieldsSync: true,
gridColUpdate: true,
filterSync: true
filterSync: true,
csvImport: true
},
commenter: {
smartSheet: true,
@ -34,6 +35,7 @@ export default {
*
* @author Naveen MR <oof1lab@gmail.com>
* @author Pranav C Balan <pranavxc@gmail.com>
* @author Wing-Kam Wong <wingkwong.code@gmail.com>
*
* @license GNU AGPL version 3 or any later version
*

5
scripts/cypress/integration/spec/roleValidation.spec.js

@ -215,6 +215,7 @@ export function _editComment(roleType, previewMode) {
export function _viewMenu(roleType, previewMode) {
let columnName = "City";
let navDrawListCnt = 1;
// Download CSV
let actionsMenuItemsCnt = 1;
cy.openTableTab(columnName, 25);
@ -231,7 +232,11 @@ export function _viewMenu(roleType, previewMode) {
// Owner, Creator will have two navigation drawer (on each side of center panel)
if (roleType == "owner" || roleType == "creator") {
navDrawListCnt = 2;
// Download CSV / Upload CSV / Shared View List / Webhook
actionsMenuItemsCnt = 4;
} else if (roleType == "editor") {
// Download CSV / Upload CSV
actionsMenuItemsCnt = 2;
}
cy.get(".v-navigation-drawer__content")

Loading…
Cancel
Save