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

User groups error handling fix and pagination fix [SCI-12243]

Browse source
This commit is contained in:
Anton 2025-08-13 12:49:32 +02:00
parent b3145f9caa
commit fff571c635
3 changed files with 6 additions and 9 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

@ -58,7 +58,7 @@ module Users
end end
render json: { message: t('user_groups.create.success') }, status: :created render json: { message: t('user_groups.create.success') }, status: :created
else else
render json: { errors: t('user_groups.create.error') }, status: :unprocessable_entity render json: { error: @user_group.errors.full_messages.join(", ") }, status: :unprocessable_entity
end end
end end

11
app/services/lists/user_groups_service.rb
View file

@ -5,14 +5,11 @@ module Lists
private private
def fetch_records def fetch_records
@records = @raw_data.joins( @records = @raw_data.left_joins(:created_by).left_joins(:user_group_memberships).includes(:users)
'LEFT OUTER JOIN users AS creators ' \ .select('user_groups.*')
'ON user_groups.created_by_id = creators.id' .select('array_agg(users.full_name) AS created_by_user')
).left_joins(:user_group_memberships).includes(:users)
.select('user_groups.* as user_groups')
.select('creators.full_name AS created_by_user')
.select('COUNT(user_groups.id) AS members_count') .select('COUNT(user_groups.id) AS members_count')
.group('user_groups.id, creators.full_name') .group('user_groups.id')
end end
def filter_records def filter_records

2
app/views/users/settings/user_groups/show.html.erb
View file

@ -11,7 +11,7 @@
<%= link_to users_settings_team_user_groups_path, class: "btn btn-light btn-black icon-btn" do %> <%= link_to users_settings_team_user_groups_path, class: "btn btn-light btn-black icon-btn" do %>
<i class="sn-icon sn-icon-arrow-left"></i> <i class="sn-icon sn-icon-arrow-left"></i>
<% end %> <% end %>
<h3 class="m-0 flex gap-0.5 items-center"> <h3 class="m-0 flex gap-0.5 items-center grow">
<% if can_manage_team?(@team) %> <% if can_manage_team?(@team) %>
<%= render partial: "shared/inline_editing", <%= render partial: "shared/inline_editing",
locals: { locals: {