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

fixes reports index for guest users

Browse source
This commit is contained in:
zmagod 2018-05-24 15:28:54 +02:00
parent 1f8db7bc49
commit bbbe06e491
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/models/project.rb
View file

@ -46,13 +46,12 @@ class Project < ApplicationRecord
if user.is_admin_of_team? team if user.is_admin_of_team? team
return where('projects.archived IS FALSE AND projects.name ILIKE ?', return where('projects.archived IS FALSE AND projects.name ILIKE ?',
"%#{name}%") "%#{name}%")
elsif user.is_normal_user_of_team? team end
return joins(:user_projects) joins(:user_projects)
.where('user_projects.user_id = ? OR projects.visibility = 1', user.id) .where('user_projects.user_id = ? OR projects.visibility = 1', user.id)
.where('projects.archived IS FALSE AND projects.name ILIKE ?', .where('projects.archived IS FALSE AND projects.name ILIKE ?',
"%#{name}%") "%#{name}%")
end end
end
def self.search( def self.search(
user, user,