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

Fixed viewable projects scope in reports controller [SCI-6200] ()

Browse source
This commit is contained in:
artoscinote 2021-11-05 14:31:05 +01:00 • committed by GitHub
parent ba5403ab5e
commit e3d08db6de
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 6 deletions

13
app/controllers/reports_controller.rb
View file

@ -354,12 +354,13 @@ class ReportsController < ApplicationController
.where.not(original_repository: live_repositories)
.select('DISTINCT ON ("repositories"."parent_id") "repositories".*')
@repositories = (live_repositories + snapshots_of_deleted).sort_by { |r| r.name.downcase }
@visible_projects = Project.active
.viewable_by_user(current_user, current_team)
.joins(experiments: :my_modules)
.merge(Experiment.active)
.merge(MyModule.active)
.select(:id, :name)
@visible_projects = current_team.projects
.active
.joins(experiments: :my_modules)
.with_granted_permissions(current_user, ProjectPermissions::READ)
.merge(Experiment.active)
.merge(MyModule.active)
.select(:id, :name)
end
def check_manage_permissions