scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-03-09 06:04:46 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #7154 from aignatov-bio/ai-sci-10289-fix-permission-assigned-task

Browse source 
Small table fixes [SCI-10289][SCI-10293][SCI-10295]
This commit is contained in:
aignatov-bio 2024-02-28 11:51:07 +01:00 committed by GitHub
commit 3f4189445b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/javascript/vue/my_modules/renderers/designated_users.vue
View file

@ -28,12 +28,15 @@
<div v-for="user in allUsers"
:key="user.value"
@click="selectUser(user)"
:class="{ '!bg-sn-super-light-blue': selectedUsers.includes(user.value) }"
:class="{
'!bg-sn-super-light-blue': selectedUsers.includes(user.value),
'cursor-pointer hover:bg-sn-super-light-grey': canManage
}"
class="whitespace-nowrap rounded px-3 py-2.5 flex items-center gap-2
hover:no-underline cursor-pointer hover:bg-sn-super-light-grey leading-5"
hover:no-underline leading-5"
>
<div class="sci-checkbox-container">
<input type="checkbox" class="sci-checkbox" :checked="selectedUsers.includes(user.value)" />
<input type="checkbox" class="sci-checkbox" :disabled="!canManage" :checked="selectedUsers.includes(user.value)" />
<label class="sci-checkbox-label"></label>
</div>
<img :src="user.params.avatar_url" class="w-7 h-7" />
@ -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)) {

2
app/javascript/vue/projects/modals/edit.vue
View file

@ -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,
};

4
app/javascript/vue/shared/datatable/pagination.vue
View file

@ -3,7 +3,7 @@
<div class="w-9 h-9">
<div class="w-9 h-9 cursor-pointer flex items-center justify-center"
@click="$emit('setPage', currentPage - 1)"
v-if="totalPage > 5 && currentPage > 1">
v-if="currentPage > 1">
<i class="sn-icon sn-icon-left cursor-pointer"></i>
</div>
</div>
@ -17,7 +17,7 @@
<div class="w-9 h-9">
<div class="w-9 h-9 cursor-pointer flex items-center justify-center"
@click="$emit('setPage', currentPage + 1)"
v-if="totalPage - currentPage > 2 && totalPage > 5">
v-if="totalPage > currentPage">
<i class="sn-icon sn-icon-right cursor-pointer"></i>
</div>
</div>