jro_apps/redmine Commit - r1283:89602004098d

If 'Display subprojects issues on main projects' is set to false:...

Jean-Philippe Lang -

r1283:89602004098d

parent child

Context file:

r1283:89602004098d

Collapse all files

app/controllers/projects_controller.rb +5 -3

                 @subprojects = @project.active_children
                 @news = @project.news.find(:all, :limit => 5, :include => [ :author, :project ], :order => "#{News.table_name}.created_on DESC")
                 @trackers = @project.rolled_up_trackers
+                cond = @project.project_condition(Setting.display_subprojects_issues?)
                 Issue.visible_by(User.current) do
                   @open_issues_by_tracker = Issue.count(:group => :tracker,
                                                         :include => [:project, :status, :tracker],
-                                                        :conditions => ["(#{Project.table_name}.id=? OR #{Project.table_name}.parent_id=?) and #{IssueStatus.table_name}.is_closed=?", @project.id, @project.id, false])
+                                                        :conditions => ["(#{cond}) AND #{IssueStatus.table_name}.is_closed=?", false])
                   @total_issues_by_tracker = Issue.count(:group => :tracker,
                                                         :include => [:project, :status, :tracker],
-                                                        :conditions => ["#{Project.table_name}.id=? OR #{Project.table_name}.parent_id=?", @project.id, @project.id])
+                                                        :conditions => cond)
                 end
                 TimeEntry.visible_by(User.current) do
                   @total_hours = TimeEntry.sum(:hours,
                                                :include => :project,
-                                               :conditions => ["(#{Project.table_name}.id = ? OR #{Project.table_name}.parent_id = ?)", @project.id, @project.id]).to_f
+                                               :conditions => cond).to_f
                 end
                 @key = User.current.rss_key
               end

app/controllers/timelog_controller.rb +2 -2

                   sql << " FROM #{TimeEntry.table_name}"
                   sql << " LEFT JOIN #{Issue.table_name} ON #{TimeEntry.table_name}.issue_id = #{Issue.table_name}.id"
                   sql << " LEFT JOIN #{Project.table_name} ON #{TimeEntry.table_name}.project_id = #{Project.table_name}.id"
-                  sql << " WHERE (#{Project.table_name}.id = %s OR #{Project.table_name}.parent_id = %s)" % [@project.id, @project.id]
+                  sql << " WHERE (%s)" % @project.project_condition(Setting.display_subprojects_issues?)
                   sql << " AND (%s)" % Project.allowed_to_condition(User.current, :view_time_entries)
                   sql << " AND spent_on BETWEEN '%s' AND '%s'" % [ActiveRecord::Base.connection.quoted_date(@date_from.to_time), ActiveRecord::Base.connection.quoted_date(@date_to.to_time)]
                   sql << " GROUP BY #{sql_group_by}, tyear, tmonth, tweek"
                 @from, @to = @to, @from if @from && @to && @from > @to
                 cond = ARCondition.new
-                cond << (@issue.nil? ? ["(#{Project.table_name}.id = ? OR #{Project.table_name}.parent_id = ?)", @project.id, @project.id] :
+                cond << (@issue.nil? ? @project.project_condition(Setting.display_subprojects_issues?) :
                                        ["#{TimeEntry.table_name}.issue_id = ?", @issue.id])
                 if @from

app/models/project.rb +6 0

                 statements.empty? ? base_statement : "((#{base_statement}) AND (#{statements.join(' OR ')}))"
               end
+              def project_condition(with_subprojects)
+                cond = "#{Project.table_name}.id = #{id}"
+                cond = "(#{cond} OR #{Project.table_name}.parent_id = #{id})" if with_subprojects
+                cond
+              end
               def self.find(*args)
                 if args.first && args.first.is_a?(String) && !args.first.match(/^\d*$/)
                   project = find_by_identifier(*args)

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