From d40756d61122ac31c16c41f1bb5ab4d0a9e507c6 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Wed, 21 Oct 2009 03:21:31 +0000 Subject: [PATCH] Renamed Project#public named_scope so it will not override Ruby's public method #4056 git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2941 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/controllers/welcome_controller.rb | 2 +- app/models/project.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb index c14ec4dbe..f2daf7449 100644 --- a/app/controllers/welcome_controller.rb +++ b/app/controllers/welcome_controller.rb @@ -24,7 +24,7 @@ class WelcomeController < ApplicationController end def robots - @projects = Project.public.active + @projects = Project.all_public.active render :layout => false, :content_type => 'text/plain' end end diff --git a/app/models/project.rb b/app/models/project.rb index 33ed3b7fa..f9030bdf2 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -75,7 +75,7 @@ class Project < ActiveRecord::Base named_scope :has_module, lambda { |mod| { :conditions => ["#{Project.table_name}.id IN (SELECT em.project_id FROM #{EnabledModule.table_name} em WHERE em.name=?)", mod.to_s] } } named_scope :active, { :conditions => "#{Project.table_name}.status = #{STATUS_ACTIVE}"} - named_scope :public, { :conditions => { :is_public => true } } + named_scope :all_public, { :conditions => { :is_public => true } } named_scope :visible, lambda { { :conditions => Project.visible_by(User.current) } } def identifier=(identifier)