From 089165477eb9dd602e7a1e57c72b90703166ab40 Mon Sep 17 00:00:00 2001 From: Anton Date: Wed, 28 Feb 2024 11:23:36 +0100 Subject: [PATCH] Small table fixes [SCI-10289][SCI-10293][SCI-10295] --- .../my_modules/renderers/designated_users.vue | 16 +++++++++++++--- app/javascript/vue/projects/modals/edit.vue | 2 +- .../vue/shared/datatable/pagination.vue | 4 ++-- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/app/javascript/vue/my_modules/renderers/designated_users.vue b/app/javascript/vue/my_modules/renderers/designated_users.vue index a3487dfdd..936251502 100644 --- a/app/javascript/vue/my_modules/renderers/designated_users.vue +++ b/app/javascript/vue/my_modules/renderers/designated_users.vue @@ -28,12 +28,15 @@
- +
@@ -63,6 +66,9 @@ export default { users() { return this.params.data.designated_users; }, + canManage() { + return this.params.data.permissions.manage_designated_users; + }, visibleUsers() { return this.users.slice(0, 4); }, @@ -104,6 +110,10 @@ export default { } }, selectUser(user) { + if (!this.canManage) { + return; + } + this.changed = true; if (this.selectedUsers.includes(user.value)) { diff --git a/app/javascript/vue/projects/modals/edit.vue b/app/javascript/vue/projects/modals/edit.vue index aea279d1d..2a4fc9c1c 100644 --- a/app/javascript/vue/projects/modals/edit.vue +++ b/app/javascript/vue/projects/modals/edit.vue @@ -63,7 +63,7 @@ export default { data() { return { name: this.project.name, - visible: this.project.visible, + visible: !this.project.hidden, defaultRole: this.project.default_public_user_role_id, error: null, }; diff --git a/app/javascript/vue/shared/datatable/pagination.vue b/app/javascript/vue/shared/datatable/pagination.vue index 3d63c3530..413c646d8 100644 --- a/app/javascript/vue/shared/datatable/pagination.vue +++ b/app/javascript/vue/shared/datatable/pagination.vue @@ -3,7 +3,7 @@
+ v-if="currentPage > 1">
@@ -17,7 +17,7 @@
+ v-if="totalPage > currentPage">