jro_apps/redmine Commit - r3817:424b4825793e

Refactor TimelogController#report's joins and provide a hook to add more....

Eric Davis -

r3817:424b4825793e

parent child

Context file:

r3817:424b4825793e

app/controllers/timelog_controller.rb +9 -2

                   sql = "SELECT #{sql_select}, tyear, tmonth, tweek, spent_on, SUM(hours) AS hours"
                   sql << " FROM #{TimeEntry.table_name}"
-                  sql << " LEFT JOIN #{Issue.table_name} ON #{TimeEntry.table_name}.issue_id = #{Issue.table_name}.id"
+                  sql << time_report_joins
-                  sql << " LEFT JOIN #{Project.table_name} ON #{TimeEntry.table_name}.project_id = #{Project.table_name}.id"
                   sql << " WHERE"
                   sql << " (%s) AND" % sql_condition
                   sql << " (spent_on BETWEEN '%s' AND '%s')" % [ActiveRecord::Base.connection.quoted_date(@from), ActiveRecord::Base.connection.quoted_date(@to)]
                 call_hook(:controller_timelog_available_criterias, { :available_criterias => @available_criterias, :project => @project })
                 @available_criterias
               end
+              def time_report_joins
+                sql = ''
+                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"
+                call_hook(:controller_timelog_time_report_joins, {:sql => sql} )
+                sql
+              end
             end

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