jro_apps/redmine Commit - r5245:fee9d605a353

Adds visibility condition to Issue.by_* count methods....

Jean-Philippe Lang -

r5245:fee9d605a353

parent child

Context file:

r5245:fee9d605a353

Collapse all files

app/models/issue.rb +14 -13

               def self.by_subproject(project)
                 ActiveRecord::Base.connection.select_all("select    s.id as status_id,
                                                             s.is_closed as closed,
-                                                            i.project_id as project_id,
+                                                            #{Issue.table_name}.project_id as project_id,
-                                                            count(i.id) as total
+                                                            count(#{Issue.table_name}.id) as total
                                                           from
-                                                            #{Issue.table_name} i, #{IssueStatus.table_name} s
+                                                            #{Issue.table_name}, #{Project.table_name}, #{IssueStatus.table_name} s
                                                           where
-                                                            i.status_id=s.id
+                                                            #{Issue.table_name}.status_id=s.id
-                                                            and i.project_id IN (#{project.descendants.active.collect{|p| p.id}.join(',')})
+                                                            and #{Issue.table_name}.project_id = #{Project.table_name}.id
-                                                          group by s.id, s.is_closed, i.project_id") if project.descendants.active.any?
+                                                            and #{visible_condition(User.current, :project => project, :with_subprojects => true)}
+                                                            and #{Issue.table_name}.project_id <> #{project.id}
+                                                          group by s.id, s.is_closed, #{Issue.table_name}.project_id") if project.descendants.active.any?
               end
               # End ReportsController extraction
                 select_field = options.delete(:field)
                 joins = options.delete(:joins)
-                where = "i.#{select_field}=j.id"
+                where = "#{Issue.table_name}.#{select_field}=j.id"
                 ActiveRecord::Base.connection.select_all("select    s.id as status_id,
                                                             s.is_closed as closed,
                                                             j.id as #{select_field},
-                                                            count(i.id) as total
+                                                            count(#{Issue.table_name}.id) as total
                                                           from
-                                                              #{Issue.table_name} i, #{IssueStatus.table_name} s, #{joins} j
+                                                              #{Issue.table_name}, #{Project.table_name}, #{IssueStatus.table_name} s, #{joins} j
                                                           where
-                                                            i.status_id=s.id
+                                                            #{Issue.table_name}.status_id=s.id
                                                             and #{where}
-                                                            and i.project_id=#{project.id}
+                                                            and #{Issue.table_name}.project_id=#{Project.table_name}.id
+                                                            and #{visible_condition(User.current, :project => project)}
                                                           group by s.id, s.is_closed, j.id")
               end
             end

test/unit/issue_test.rb +10 -2

               end
               test "#by_tracker" do
+                User.current = User.anonymous
                 groups = Issue.by_tracker(Project.find(1))
                 assert_equal 3, groups.size
                 assert_equal 7, groups.inject(0) {|sum, group| sum + group['total'].to_i}
               end
               test "#by_version" do
+                User.current = User.anonymous
                 groups = Issue.by_version(Project.find(1))
                 assert_equal 3, groups.size
                 assert_equal 3, groups.inject(0) {|sum, group| sum + group['total'].to_i}
               end
               test "#by_priority" do
+                User.current = User.anonymous
                 groups = Issue.by_priority(Project.find(1))
                 assert_equal 4, groups.size
                 assert_equal 7, groups.inject(0) {|sum, group| sum + group['total'].to_i}
               end
               test "#by_category" do
+                User.current = User.anonymous
                 groups = Issue.by_category(Project.find(1))
                 assert_equal 2, groups.size
                 assert_equal 3, groups.inject(0) {|sum, group| sum + group['total'].to_i}
               end
               test "#by_assigned_to" do
+                User.current = User.anonymous
                 groups = Issue.by_assigned_to(Project.find(1))
                 assert_equal 2, groups.size
                 assert_equal 2, groups.inject(0) {|sum, group| sum + group['total'].to_i}
               end
               test "#by_author" do
+                User.current = User.anonymous
                 groups = Issue.by_author(Project.find(1))
                 assert_equal 4, groups.size
                 assert_equal 7, groups.inject(0) {|sum, group| sum + group['total'].to_i}
               end
               test "#by_subproject" do
+                User.current = User.anonymous
                 groups = Issue.by_subproject(Project.find(1))
-                assert_equal 2, groups.size
+                # Private descendant not visible
-                assert_equal 5, groups.inject(0) {|sum, group| sum + group['total'].to_i}
+                assert_equal 1, groups.size
+                assert_equal 2, groups.inject(0) {|sum, group| sum + group['total'].to_i}
               end

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