mirror of
https://github.com/scinote-eln/scinote-web.git
synced 2025-09-08 14:15:35 +08:00
User groups error handling fix and pagination fix [SCI-12243]
This commit is contained in:
parent
b3145f9caa
commit
fff571c635
3 changed files with 6 additions and 9 deletions
|
@ -58,7 +58,7 @@ module Users
|
|||
end
|
||||
render json: { message: t('user_groups.create.success') }, status: :created
|
||||
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
|
||||
|
||||
|
|
|
@ -5,14 +5,11 @@ module Lists
|
|||
private
|
||||
|
||||
def fetch_records
|
||||
@records = @raw_data.joins(
|
||||
'LEFT OUTER JOIN users AS creators ' \
|
||||
'ON user_groups.created_by_id = creators.id'
|
||||
).left_joins(:user_group_memberships).includes(:users)
|
||||
.select('user_groups.* as user_groups')
|
||||
.select('creators.full_name AS created_by_user')
|
||||
@records = @raw_data.left_joins(:created_by).left_joins(:user_group_memberships).includes(:users)
|
||||
.select('user_groups.*')
|
||||
.select('array_agg(users.full_name) AS created_by_user')
|
||||
.select('COUNT(user_groups.id) AS members_count')
|
||||
.group('user_groups.id, creators.full_name')
|
||||
.group('user_groups.id')
|
||||
end
|
||||
|
||||
def filter_records
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
<%= 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>
|
||||
<% 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) %>
|
||||
<%= render partial: "shared/inline_editing",
|
||||
locals: {
|
||||
|
|
Loading…
Add table
Reference in a new issue