jro_apps/redmine Commit - r5204:405fc07e9073

Makes visible scopes accept projects option and deprecate Project.visible_by....

Jean-Philippe Lang -

r5204:405fc07e9073

parent child

Context file:

r5204:405fc07e9073

Collapse all files

app/models/changeset.rb +1 -1

               validates_uniqueness_of :scmid, :scope => :repository_id, :allow_nil => true
               named_scope :visible, lambda {|*args| { :include => {:repository => :project},
-                                                      :conditions => Project.allowed_to_condition(args.first || User.current, :view_changesets) } }
+                                                      :conditions => Project.allowed_to_condition(args.shift || User.current, :view_changesets, *args) } }
               def revision=(r)
                 write_attribute :revision, (r.nil? ? nil : r.to_s)

app/models/document.rb +1 -1

               validates_length_of :title, :maximum => 60
               named_scope :visible, lambda {|*args| { :include => :project,
-                                                      :conditions => Project.allowed_to_condition(args.first || User.current, :view_documents) } }
+                                                      :conditions => Project.allowed_to_condition(args.shift || User.current, :view_documents, *args) } }
               def visible?(user=User.current)
                 !user.nil? && user.allowed_to?(:view_documents, project)

app/models/issue.rb +1 -1

               validates_numericality_of :estimated_hours, :allow_nil => true
               named_scope :visible, lambda {|*args| { :include => :project,
-                                                      :conditions => Issue.visible_condition(args.first || User.current) } }
+                                                      :conditions => Issue.visible_condition(args.shift || User.current, *args) } }
               named_scope :open, :conditions => ["#{IssueStatus.table_name}.is_closed = ?", false], :include => :status

app/models/journal.rb +1 -1

               named_scope :visible, lambda {|*args| {
                 :include => {:issue => :project},
-                :conditions => Issue.visible_condition(args.first || User.current)
+                :conditions => Issue.visible_condition(args.shift || User.current, *args)
               }}
               def save(*args)

app/models/message.rb +2 -2

               acts_as_searchable :columns => ['subject', 'content'],
                                  :include => {:board => :project},
-                                 :project_key => 'project_id',
+                                 :project_key => "#{Board.table_name}.project_id",
                                  :date_column => "#{table_name}.created_on"
               acts_as_event :title => Proc.new {|o| "#{o.board.name}: #{o.subject}"},
                             :description => :content,
               after_create :add_author_as_watcher
               named_scope :visible, lambda {|*args| { :include => {:board => :project},
-                                                      :conditions => Project.allowed_to_condition(args.first || User.current, :view_messages) } }
+                                                      :conditions => Project.allowed_to_condition(args.shift || User.current, :view_messages, *args) } }
               def visible?(user=User.current)
                 !user.nil? && user.allowed_to?(:view_messages, project)

app/models/news.rb +1 -1

               named_scope :visible, lambda {|*args| {
                 :include => :project,
-                :conditions => Project.allowed_to_condition(args.first || User.current, :view_news)
+                :conditions => Project.allowed_to_condition(args.shift || User.current, :view_news, *args)
               }}
               def visible?(user=User.current)

app/models/project.rb +19 -14

               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 :all_public, { :conditions => { :is_public => true } }
-              named_scope :visible, lambda { { :conditions => Project.visible_by(User.current) } }
+              named_scope :visible, lambda {|*args| {:conditions => Project.visible_condition(args.shift || User.current, *args) }}
               def initialize(attributes = nil)
                 super
               # returns latest created projects
               # non public projects will be returned only if user is a member of those
               def self.latest(user=nil, count=5)
-                find(:all, :limit => count, :conditions => visible_by(user), :order => "created_on DESC")
+                visible(user).find(:all, :limit => count, :order => "created_on DESC")
               end
-              # Returns a SQL :conditions string used to find all active projects for the specified user.
+              def self.visible_by(user=nil)
+                ActiveSupport::Deprecation.warn "Project.visible_by is deprecated and will be removed in Redmine 1.3.0. Use Project.visible_condition instead."
+                visible_condition(user || User.current)
+              end
+              # Returns a SQL conditions string used to find all projects visible by the specified user.
               #
               # Examples:
-              #     Projects.visible_by(admin)        => "projects.status = 1"
+              #   Project.visible_condition(admin)        => "projects.status = 1"
-              #     Projects.visible_by(normal_user)  => "projects.status = 1 AND projects.is_public = 1"
+              #   Project.visible_condition(normal_user)  => "((projects.status = 1) AND (projects.is_public = 1 OR projects.id IN (1,3,4)))"
-              def self.visible_by(user=nil)
+              #   Project.visible_condition(anonymous)    => "((projects.status = 1) AND (projects.is_public = 1))"
-                user ||= User.current
+              def self.visible_condition(user, options={})
-                if user && user.admin?
+                allowed_to_condition(user, :view_project, options)
-                  return "#{Project.table_name}.status=#{Project::STATUS_ACTIVE}"
-                elsif user && user.memberships.any?
-                  return "#{Project.table_name}.status=#{Project::STATUS_ACTIVE} AND (#{Project.table_name}.is_public = #{connection.quoted_true} or #{Project.table_name}.id IN (#{user.memberships.collect{|m| m.project_id}.join(',')}))"
-                else
-                  return "#{Project.table_name}.status=#{Project::STATUS_ACTIVE} AND #{Project.table_name}.is_public = #{connection.quoted_true}"
-                end
               end
+              # Returns a SQL conditions string used to find all projects for which +user+ has the given +permission+
+              #
+              # Valid options:
+              # * :project => limit the condition to project
+              # * :with_subprojects => limit the condition to project and its subprojects
+              # * :member => limit the condition to the user projects
               def self.allowed_to_condition(user, permission, options={})
                 base_statement = "#{Project.table_name}.status=#{Project::STATUS_ACTIVE}"
                 if perm = Redmine::AccessControl.permission(permission)

app/models/time_entry.rb +1 -1

               named_scope :visible, lambda {|*args| {
                 :include => :project,
-                :conditions => Project.allowed_to_condition(args.first || User.current, :view_time_entries)
+                :conditions => Project.allowed_to_condition(args.shift || User.current, :view_time_entries, *args)
               }}
               def after_initialize

test/unit/issue_test.rb +16 0

@@ -106,6 +106,22 class IssueTest < ActiveSupport::TestCase
106	assert issues.detect {\|issue\| !issue.project.is_public?}	106	assert issues.detect {\|issue\| !issue.project.is_public?}
107	end	107	end
108		108
		109	def test_visible_scope_with_project
		110	project = Project.find(1)
		111	issues = Issue.visible(User.find(2), :project => project).all
		112	projects = issues.collect(&:project).uniq
		113	assert_equal 1, projects.size
		114	assert_equal project, projects.first
		115	end
		116
		117	def test_visible_scope_with_project_and_subprojects
		118	project = Project.find(1)
		119	issues = Issue.visible(User.find(2), :project => project, :with_subprojects => true).all
		120	projects = issues.collect(&:project).uniq
		121	assert projects.size > 1
		122	assert_equal [], projects.select {\|p\| !p.is_or_is_descendant_of?(project)}
		123	end
		124
109	def test_errors_full_messages_should_include_custom_fields_errors	125	def test_errors_full_messages_should_include_custom_fields_errors
110	field = IssueCustomField.find_by_name('Database')	126	field = IssueCustomField.find_by_name('Database')
111		127

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages