From 1feb13c74abf9ced7366a6aeb19d2ec7f697df32 Mon Sep 17 00:00:00 2001 From: Oleksii Kriuchykhin Date: Wed, 7 Nov 2018 22:27:57 +0100 Subject: [PATCH] Improve counters on projects overview table [SCI-2785] --- app/services/projects_overview_service.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/services/projects_overview_service.rb b/app/services/projects_overview_service.rb index 113d37035..400ede2c6 100644 --- a/app/services/projects_overview_service.rb +++ b/app/services/projects_overview_service.rb @@ -105,13 +105,13 @@ class ProjectsOverviewService 'LEFT OUTER JOIN user_projects ON user_projects.project_id = projects.id' ) exp_join = - 'LEFT OUTER JOIN experiments ON experiments.project_id = projects.id' + 'LEFT OUTER JOIN experiments ON experiments.project_id = projects.id'\ + ' AND ((projects.archived = true)'\ + ' OR (projects.archived = false AND experiments.archived = false))' 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 + 'LEFT OUTER JOIN my_modules ON my_modules.experiment_id = experiments.id'\ + ' AND ((projects.archived = true)'\ + ' OR (projects.archived = false AND my_modules.archived = false))' projects = projects.joins(exp_join).joins(task_join) # Only admins see all projects of the team