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

Fix global search for inventory items from shared inventories [SCI-11532] (#8212)

Browse source
This commit is contained in:
Alex Kriuchykhin 2025-02-06 09:26:25 +01:00 committed by GitHub
parent 3694bd6f2b
commit bfb067cd7a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/search_controller.rb
View file

@ -114,7 +114,7 @@ class SearchController < ApplicationController
return
when 'repository_rows'
@model = RepositoryRow
search_by_name(RepositoryRow)
search_by_name
render json: @records,
each_serializer: GlobalSearch::RepositoryRowSerializer,

6
app/models/repository_row.rb
View file

@ -137,11 +137,7 @@ class RepositoryRow < ApplicationRecord
teams = options[:teams] || current_team || user.teams.select(:id)
searchable_row_fields = [RepositoryRow::PREFIXED_ID_SQL, 'repository_rows.name', 'users.full_name']
readable_rows =
distinct
.joins(:repository, :created_by)
.where(repositories: { id: Repository.with_granted_permissions(user, RepositoryPermissions::READ).select(:id),
team_id: teams })
readable_rows = distinct.joins(:repository, :created_by).viewable_by_user(user, teams)
readable_rows = readable_rows.active unless include_archived
repository_rows = readable_rows.where_attributes_like_boolean(searchable_row_fields, query, options)