jro_apps/redmine Commit - r4362:4715a37937cb

Gantt: Avoid unnecessary queries before rendering....

Jean-Philippe Lang -

r4362:4715a37937cb

parent child

Context file:

r4362:4715a37937cb

Collapse all files

app/views/gantts/show.html.erb +4 -2

             # Width of the entire chart
             g_width = (@gantt.date_to - @gantt.date_from + 1)*zoom
-            # Collect the number of issues on Versions
+            @gantt.render(:top => headers_height + 8, :zoom => zoom, :g_width => g_width)
             g_height = [(20 * (@gantt.number_of_rows + 6))+150, 206].max
             t_height = g_height + headers_height
-            @gantt.render(:top => headers_height + 8, :zoom => zoom, :g_width => g_width)
             %>
             <table width="100%" style="border:0; border-collapse: collapse;">
             <tr>

lib/redmine/helpers/gantt.rb +8 -1

                     @subjects = ''
                     @lines = ''
+                    @number_of_rows = nil
                   end
                   def common_params
                         ### Extracted from the HTML view/helpers
                   # Returns the number of rows that will be rendered on the Gantt chart
                   def number_of_rows
+                    return @number_of_rows if @number_of_rows
                     if @project
                       return number_of_rows_on_project(@project)
                     else
                     @subjects = '' unless options[:only] == :lines
                     @lines = '' unless options[:only] == :subjects
+                    @number_of_rows = 0
                     if @project
                       render_project(@project, options)
                     options[:top] += options[:top_increment]
                     options[:indent] += options[:indent_increment]
+                    @number_of_rows += 1
                     # Second, Issues without a version
                     issues = project.issues.for_gantt.without_version.with_query(@query)
                       line_for_issue(i, options) unless options[:only] == :subjects
                       options[:top] += options[:top_increment]
+                      @number_of_rows += 1
                     end
                   end
                     line_for_version(version, options) unless options[:only] == :subjects
                     options[:top] += options[:top_increment]
+                    @number_of_rows += 1
                     # Remove the project requirement for Versions because it will
                     # restrict issues to only be on the current project.  This
                     # ends up missing issues which are assigned to shared versions.

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