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

Merge pull request #8768 from aignatov-bio/ai-sci-12218-css-fixes-for-user-group

Browse source 
Css fixes for user groups [SCI-12218]
This commit is contained in:
aignatov-bio 2025-08-12 10:02:32 +02:00 • committed by GitHub
commit 579ecdeada
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/users/settings/user_groups_controller.rb
View file

@ -5,7 +5,7 @@ module Users
class UserGroupsController < ApplicationController class UserGroupsController < ApplicationController
before_action :load_team before_action :load_team
before_action :set_breadcrumbs_items, only: %i(index show) before_action :set_breadcrumbs_items, only: %i(index show)
before_action :check_user_groups_enabled before_action :check_user_groups_enabled, except: :users
before_action :load_user_group, except: %i(index unassigned_users actions_toolbar create) before_action :load_user_group, except: %i(index unassigned_users actions_toolbar create)
before_action :check_read_permissions, only: %i(index show unassigned_users actions_toolbar users) before_action :check_read_permissions, only: %i(index show unassigned_users actions_toolbar users)
before_action :check_manage_permissions, except: %i(index show unassigned_users actions_toolbar users) before_action :check_manage_permissions, except: %i(index show unassigned_users actions_toolbar users)

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

@ -54,7 +54,7 @@
> >
</div> </div>
<div class="truncate"> <div class="truncate">
<div class="flex flex-row gap-2"> <div class="flex flex-row gap-2 items-center">
<div class="truncate" <div class="truncate"
:title="userGroupAssignment.attributes.user_group.name" :title="userGroupAssignment.attributes.user_group.name"
>{{ userGroupAssignment.attributes.user_group.name }}</div> >{{ userGroupAssignment.attributes.user_group.name }}</div>
@ -114,7 +114,7 @@
> >
</div> </div>
<div class="truncate"> <div class="truncate">
<div class="flex flex-row gap-2"> <div class="flex flex-row gap-2 items-center">
<div class="truncate" <div class="truncate"
:title="userAssignment.attributes.user.name" :title="userAssignment.attributes.user.name"
:data-e2e="`e2e-TX-${dataE2e}-${userAssignment.attributes.user.name.replace(/\W/g, '')}-name`" :data-e2e="`e2e-TX-${dataE2e}-${userAssignment.attributes.user.name.replace(/\W/g, '')}-name`"

8
app/javascript/vue/shared/select_dropdown.vue
View file

@ -73,7 +73,7 @@
{{ i18n.t('general.select_all') }} {{ i18n.t('general.select_all') }}
</div> </div>
</div> </div>
<perfect-scrollbar ref="scrollContainer" class="p-2.5 flex flex-col max-h-80 relative" :class="{ 'pt-0': withCheckboxes }"> <div ref="scrollContainer" class="p-2.5 flex flex-col max-h-80 relative overflow-y-auto" :class="{ 'pt-0': withCheckboxes }">
<template v-for="(option, i) in filteredOptions" :key="option[0]"> <template v-for="(option, i) in filteredOptions" :key="option[0]">
<div <div
@click.stop="setValue(option[0])" @click.stop="setValue(option[0])"
@ -99,7 +99,7 @@
<div v-if="filteredOptions.length === 0" class="text-sn-grey text-center py-2.5"> <div v-if="filteredOptions.length === 0" class="text-sn-grey text-center py-2.5">
{{ noOptionsPlaceholder || this.i18n.t('general.select_dropdown.no_options_placeholder') }} {{ noOptionsPlaceholder || this.i18n.t('general.select_dropdown.no_options_placeholder') }}
</div> </div>
</perfect-scrollbar> </div>
</div> </div>
</teleport> </teleport>
</template> </template>
@ -276,7 +276,7 @@ export default {
this.$nextTick(() => { this.$nextTick(() => {
this.setPosition(); this.setPosition();
this.$refs.search?.focus(); this.$refs.search?.focus();
this.$refs.scrollContainer.$el.addEventListener('scroll', this.loadNextPage); this.$refs.scrollContainer.addEventListener('scroll', this.loadNextPage);
}); });
} }
}, },
@ -296,7 +296,7 @@ export default {
this.fetchOptions(); this.fetchOptions();
}, },
loadNextPage() { loadNextPage() {
const container = this.$refs.scrollContainer.$el; const container = this.$refs.scrollContainer;
if (this.nextPage && container.scrollTop + container.clientHeight >= container.scrollHeight) { if (this.nextPage && container.scrollTop + container.clientHeight >= container.scrollHeight) {
this.fetchOptions(); this.fetchOptions();
} }