scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 07:26:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1345 from okriuchykhin/ok_SCI_2785

Browse source 
Show all experiments and tasks for archived projects [SCI-2785]
This commit is contained in:
Alex Kriuchykhin 2018-10-29 11:56:38 +01:00 committed by GitHub
parent 36cd1dbb88 e9a8826a1e
commit 2b4ef619c2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/services/projects_overview_service.rb
View file

@ -103,13 +103,16 @@ class ProjectsOverviewService
def fetch_dt_records
projects = @team.projects.joins(
'LEFT OUTER JOIN user_projects ON user_projects.project_id = projects.id'
).joins(
'LEFT OUTER JOIN experiments ON experiments.project_id = projects.id'\
' AND experiments.archived = projects.archived'
).joins(
'LEFT OUTER JOIN my_modules ON my_modules.experiment_id = experiments.id'\
' AND my_modules.archived = projects.archived'
)
exp_join =
'LEFT OUTER JOIN experiments ON experiments.project_id = projects.id'
task_join =
'LEFT OUTER JOIN my_modules ON my_modules.experiment_id = experiments.id'
unless @params[:filter] == 'archived'
exp_join += ' AND experiments.archived = projects.archived'
task_join += ' AND my_modules.archived = projects.archived'
end
projects = projects.joins(exp_join).joins(task_join)
# Only admins see all projects of the team
unless @user.is_admin_of_team?(@team)