scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-10-02 09:54:37 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #7386 from aignatov-bio/ai-sci-10538-small-fixes-access-and-experiment

Browse source 
Fix access modal all role and experiment card [SCI-10538][SCI-10539]
This commit is contained in:
aignatov-bio 2024-03-27 16:57:11 +01:00 • committed by GitHub
commit eb41e25e8a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/javascript/vue/experiments/card.vue
View file

@ -1,5 +1,5 @@
<template> <template>
<div class="px-3 pt-3 pb-4 rounded border-solid border border-sn-gray flex flex-col h-56" <div class="px-3 pt-3 pb-4 rounded border-solid border border-sn-gray flex flex-col"
:class="{ 'bg-sn-light-grey': dtComponent.currentViewMode === 'archived', [cardMinWidth]: true}"> :class="{ 'bg-sn-light-grey': dtComponent.currentViewMode === 'archived', [cardMinWidth]: true}">
<div class="flex items-center gap-4 mb-2"> <div class="flex items-center gap-4 mb-2">
<div class="sci-checkbox-container"> <div class="sci-checkbox-container">
@ -16,7 +16,7 @@
<a :href="params.urls.show" <a :href="params.urls.show"
:title="params.name" :title="params.name"
:class="{'pointer-events-none text-sn-grey': !params.urls.show}" :class="{'pointer-events-none text-sn-grey': !params.urls.show}"
class="font-bold mb-auto text-sn-blue hover:no-underline line-clamp-2 hover:text-sn-blue h-10"> class="font-bold mb-4 shrink-0 text-sn-blue hover:no-underline line-clamp-2 hover:text-sn-blue h-10">
{{ params.name }} {{ params.name }}
</a> </a>
<div class="flex gap-4 mb-2.5"> <div class="flex gap-4 mb-2.5">

4
app/javascript/vue/projects/card.vue
View file

@ -1,7 +1,7 @@
<template> <template>
<div v-if="!params.folder" <div v-if="!params.folder"
:class="{ 'bg-sn-light-grey': dtComponent.currentViewMode === 'archived', [cardMinWidth]: true }" :class="{ 'bg-sn-light-grey': dtComponent.currentViewMode === 'archived', [cardMinWidth]: true }"
class="px-3 pt-3 pb-4 rounded border-solid border border-sn-gray flex flex-col h-56" > class="px-3 pt-3 pb-4 rounded border-solid border border-sn-gray flex flex-col" >
<div class="flex items-center gap-4 mb-2"> <div class="flex items-center gap-4 mb-2">
<div class="sci-checkbox-container"> <div class="sci-checkbox-container">
<input <input
@ -17,7 +17,7 @@
<a :href="params.urls.show" <a :href="params.urls.show"
:title="params.name" :title="params.name"
:class="{'pointer-events-none text-sn-grey': !params.urls.show}" :class="{'pointer-events-none text-sn-grey': !params.urls.show}"
class="font-bold mb-4 text-sn-blue hover:no-underline line-clamp-3 hover:text-sn-blue h-[60px]"> class="font-bold mb-4 text-sn-blue shrink-0 hover:no-underline line-clamp-3 hover:text-sn-blue h-[60px]">
{{ params.name }} {{ params.name }}
</a> </a>
<div class="grid gap-x-2 gap-y-3 grid-cols-[90px_auto] mt-auto text-xs"> <div class="grid gap-x-2 gap-y-3 grid-cols-[90px_auto] mt-auto text-xs">

8
app/javascript/vue/shared/access_modal/edit.vue
View file

@ -26,7 +26,7 @@
<MenuDropdown <MenuDropdown
v-if="params.object.top_level_assignable && params.object.urls.update_access" v-if="params.object.top_level_assignable && params.object.urls.update_access"
class="ml-auto" class="ml-auto"
:listItems="rolesFromatted" :listItems="rolesFromatted(default_role)"
:btnText="this.roles.find((role) => role[0] == default_role)[1]" :btnText="this.roles.find((role) => role[0] == default_role)[1]"
:position="'right'" :position="'right'"
:caret="true" :caret="true"
@ -59,7 +59,7 @@
<MenuDropdown <MenuDropdown
v-if="!userAssignment.attributes.last_owner && params.object.urls.update_access && !(userAssignment.attributes.current_user && userAssignment.attributes.inherit_message)" v-if="!userAssignment.attributes.last_owner && params.object.urls.update_access && !(userAssignment.attributes.current_user && userAssignment.attributes.inherit_message)"
class="ml-auto" class="ml-auto"
:listItems="rolesFromatted(userAssignment)" :listItems="rolesFromatted(userAssignment.attributes.user_role.id)"
:btnText="userAssignment.attributes.user_role.name" :btnText="userAssignment.attributes.user_role.name"
:position="'right'" :position="'right'"
:caret="true" :caret="true"
@ -140,7 +140,7 @@ export default {
this.$emit('usersReloaded'); this.$emit('usersReloaded');
}); });
}, },
rolesFromatted(userAssignment = null) { rolesFromatted(activeRoleId = null) {
let roles = []; let roles = [];
if (!this.params.object.top_level_assignable) { if (!this.params.object.top_level_assignable) {
@ -157,7 +157,7 @@ export default {
emit: 'setRole', emit: 'setRole',
text: role[1], text: role[1],
params: role[0], params: role[0],
active: (userAssignment?.attributes?.user_role?.id === role[0]) active: (activeRoleId === role[0])
} }
))); )));