jro_apps/redmine Commit - r15160:26ec2cdc0727

Merged r15540 (#285)....

Jean-Philippe Lang -

r15160:26ec2cdc0727

parent child

Context file:

r15160:26ec2cdc0727

app/controllers/projects_controller.rb +1 -1

                 @users_by_role = @project.users_by_role
                 @subprojects = @project.children.visible.to_a
                 @news = @project.news.limit(5).includes(:author, :project).reorder("#{News.table_name}.created_on DESC").to_a
-                @trackers = @project.rolled_up_trackers
+                @trackers = @project.rolled_up_trackers.visible
                 cond = @project.project_condition(Setting.display_subprojects_issues?)

app/controllers/reports_controller.rb +2 -2

               before_filter :find_project, :authorize, :find_issue_statuses
               def issue_report
-                @trackers = @project.trackers
+                @trackers = @project.rolled_up_trackers(false).visible
                 @versions = @project.shared_versions.sort
                 @priorities = IssuePriority.all.reverse
                 @categories = @project.issue_categories
                 case params[:detail]
                 when "tracker"
                   @field = "tracker_id"
-                  @rows = @project.trackers
+                  @rows = @project.rolled_up_trackers(false).visible
                   @data = Issue.by_tracker(@project)
                   @report_title = l(:field_tracker)
                 when "version"

app/models/project.rb +18 -10

@@ -421,16 +421,24 class Project < ActiveRecord::Base
421	save	421	save
422	end	422	end
423		423
424	# Returns a~~n array~~ of the trackers used by the project and its active sub projects	424	# Returns a scope of the trackers used by the project and its active sub projects
425	def rolled_up_trackers	425	def rolled_up_trackers(include_subprojects=true)
426	@rolled_up_trackers \|\|=	426	if include_subprojects
427	Tracker.	427	@rolled_up_trackers \|\|= rolled_up_trackers_base_scope.
428	joins(projects: :enabled_modules).	428	where("#{Project.table_name}.lft >= ? AND #{Project.table_name}.rgt <= ?", lft, rgt)
429	where("#{Project.table_name}.lft >= ? AND #{Project.table_name}.rgt <= ? AND #{Project.table_name}.status <> ?", lft, rgt, STATUS_ARCHIVED).	429	else
430	where("#{EnabledModule.table_name}.name = ?", 'issue_tracking').	430	rolled_up_trackers_base_scope.
431	uniq.	431	where(:projects => {:id => id})
432	sorted.	432	end
433	to_a	433	end
		434
		435	def rolled_up_trackers_base_scope
		436	Tracker.
		437	joins(projects: :enabled_modules).
		438	where("#{Project.table_name}.status <> ?", STATUS_ARCHIVED).
		439	where(:enabled_modules => {:name => 'issue_tracking'}).
		440	uniq.
		441	sorted
434	end	442	end
435		443
436	# Closes open and locked project versions that are completed	444	# Closes open and locked project versions that are completed

app/models/query.rb +1 -1

               end
               def trackers
-                @trackers ||= project.nil? ? Tracker.sorted.to_a : project.rolled_up_trackers
+                @trackers ||= (project.nil? ? Tracker.all : project.rolled_up_trackers).visible.sorted
               end
               # Returns a hash of localized labels for all filter operators

app/models/tracker.rb +23 0

@@ -46,6 +46,29 class Tracker < ActiveRecord::Base
46	scope :sorted, lambda { order(:position) }	46	scope :sorted, lambda { order(:position) }
47	scope :named, lambda {\|arg\| where("LOWER(#{table_name}.name) = LOWER(?)", arg.to_s.strip)}	47	scope :named, lambda {\|arg\| where("LOWER(#{table_name}.name) = LOWER(?)", arg.to_s.strip)}
48		48
		49	# Returns the trackers that are visible by the user.
		50	#
		51	# Examples:
		52	# project.trackers.visible(user)
		53	# => returns the trackers that are visible by the user in project
		54	#
		55	# Tracker.visible(user)
		56	# => returns the trackers that are visible by the user in at least on project
		57	scope :visible, lambda {\|*args\|
		58	user = args.shift \|\| User.current
		59	condition = Project.allowed_to_condition(user, :view_issues) do \|role, user\|
		60	unless role.permissions_all_trackers?(:view_issues)
		61	tracker_ids = role.permissions_tracker_ids(:view_issues)
		62	if tracker_ids.any?
		63	"#{Tracker.table_name}.id IN (#{tracker_ids.join(',')})"
		64	else
		65	'1=0'
		66	end
		67	end
		68	end
		69	joins(:projects).where(condition).uniq
		70	}
		71
49	def to_s; name end	72	def to_s; name end
50		73
51	def <=>(tracker)	74	def <=>(tracker)

test/unit/tracker_test.rb +13 -1

             require File.expand_path('../../test_helper', __FILE__)
             class TrackerTest < ActiveSupport::TestCase
-              fixtures :trackers, :workflows, :issue_statuses, :roles, :issues
+              fixtures :trackers, :workflows, :issue_statuses, :roles, :issues, :projects, :projects_trackers
               def test_sorted_scope
                 assert_equal Tracker.all.sort, Tracker.sorted.to_a
                 assert_equal Tracker.find_by_name('Feature'), Tracker.named('feature').first
               end
+              def test_visible_scope_chained_with_project_rolled_up_trackers
+                project = Project.find(1)
+                role = Role.generate!
+                role.add_permission! :view_issues
+                role.set_permission_trackers :view_issues, [2]
+                role.save!
+                user = User.generate!
+                User.add_to_project user, project, role
+                assert_equal [2], project.rolled_up_trackers(false).visible(user).map(&:id)
+              end
               def test_copy_workflows
                 source = Tracker.find(1)
                 rules_count = source.workflow_rules.count

General Comments 0

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

No TODOs yet

	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