scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-09-06 13:14:29 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #8824 from andrej-scinote/aj_SCI_12275

Browse source 
Fix repositories access sorting for shared repositories [SCI-12275]
This commit is contained in:
andrej-scinote 2025-08-21 11:31:23 +02:00 • committed by GitHub
commit 4ad116b4d2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/services/lists/repositories_service.rb
View file

@ -5,10 +5,13 @@ module Lists
private private
def fetch_records def fetch_records
user_assignments = @raw_data.joins(:user_assignments).select(:assignable_id, :user_id) user_assignments = @raw_data.joins(:user_assignments).where(user_assignments: { team_id: @user.current_team.id }).select(:assignable_id, :user_id)
user_group_assignments = @raw_data.joins(user_group_assignments: { user_group: :user_group_memberships }) user_group_assignments = @raw_data.joins(user_group_assignments: { user_group: :user_group_memberships })
.where(user_group_assignments: { team_id: @user.current_team.id })
.select('user_group_assignments.assignable_id, user_group_memberships.user_id') .select('user_group_assignments.assignable_id, user_group_memberships.user_id')
team_assignments = @raw_data.joins(team_assignments: { team: :user_assignments }).select('team_assignments.assignable_id, user_assignments.user_id') team_assignments = @raw_data.joins(team_assignments: { team: :user_assignments })
.where(team_assignments: { team_id: @user.current_team.id })
.select('team_assignments.assignable_id, user_assignments.user_id')
@records = @raw_data.joins('LEFT OUTER JOIN users AS creators ' \ @records = @raw_data.joins('LEFT OUTER JOIN users AS creators ' \
'ON repositories.created_by_id = creators.id') 'ON repositories.created_by_id = creators.id')