diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 634ab0a13..dc991c59d 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -69,7 +69,7 @@ class UsersController < ApplicationController def show # show projects based on current user visibility - @memberships = @user.memberships.all(:conditions => Project.visible_by(User.current)) + @memberships = @user.memberships.all(:conditions => Project.visible_condition(User.current)) events = Redmine::Activity::Fetcher.new(User.current, :author => @user).events(nil, nil, :limit => 10) @events_by_day = events.group_by(&:event_date) diff --git a/test/functional/projects_controller_test.rb b/test/functional/projects_controller_test.rb index 74912a764..12eb372e0 100644 --- a/test/functional/projects_controller_test.rb +++ b/test/functional/projects_controller_test.rb @@ -57,7 +57,7 @@ class ProjectsControllerTest < ActionController::TestCase assert_response :success assert_template 'common/feed.atom.rxml' assert_select 'feed>title', :text => 'Redmine: Latest projects' - assert_select 'feed>entry', :count => Project.count(:conditions => Project.visible_by(User.current)) + assert_select 'feed>entry', :count => Project.count(:conditions => Project.visible_condition(User.current)) end context "#index" do