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

Merge pull request #1361 from okriuchykhin/ok_SCI_2785_v2

Browse source 
Improve counters on projects overview table [SCI-2785]
This commit is contained in:
Alex Kriuchykhin 2018-11-09 09:37:41 +01:00 committed by GitHub
commit eb72ea69dd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/services/projects_overview_service.rb
View file

@ -105,13 +105,13 @@ class ProjectsOverviewService
'LEFT OUTER JOIN user_projects ON user_projects.project_id = projects.id' 'LEFT OUTER JOIN user_projects ON user_projects.project_id = projects.id'
) )
exp_join = 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 = task_join =
'LEFT OUTER JOIN my_modules ON my_modules.experiment_id = experiments.id' 'LEFT OUTER JOIN my_modules ON my_modules.experiment_id = experiments.id'\
unless @params[:filter] == 'archived' ' AND ((projects.archived = true)'\
exp_join += ' AND experiments.archived = projects.archived' ' OR (projects.archived = false AND my_modules.archived = false))'
task_join += ' AND my_modules.archived = projects.archived'
end
projects = projects.joins(exp_join).joins(task_join) projects = projects.joins(exp_join).joins(task_join)
# Only admins see all projects of the team # Only admins see all projects of the team