Commit 97f6315b authored by Jean-Philippe Lang's avatar Jean-Philippe Lang

Fixed: SQL error when a non-admin user displays the project list

git-svn-id: http://redmine.rubyforge.org/svn/trunk@555 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent e7ff47cf
......@@ -77,7 +77,7 @@ class Project < ActiveRecord::Base
def self.visible_by(user=nil)
if user && user.admin?
return ["#{Project.table_name}.status=#{Project::STATUS_ACTIVE}"]
elsif user && !user.memberships.empty?
elsif user && !user.memberships.any?
return ["#{Project.table_name}.status=#{Project::STATUS_ACTIVE} AND (#{Project.table_name}.is_public = ? or #{Project.table_name}.id IN (#{user.memberships.collect{|m| m.project_id}.join(',')}))", true]
else
return ["#{Project.table_name}.status=#{Project::STATUS_ACTIVE} AND #{Project.table_name}.is_public = ?", true]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment