Performance improvement on calendar and gantt (about 45% on gantt for large number of issues).

Partial issues/_tooltip is replaced by an helper and some translated strings are now cached. git-svn-id: http://redmine.rubyforge.org/svn/trunk@794 e93f8b46-1217-0410-a6f0-8f06a7374b81

Performance improvement on calendar and gantt (about 45% on gantt for large number of issues).
Partial issues/_tooltip is replaced by an helper and some translated strings are now cached. git-svn-id: http://redmine.rubyforge.org/svn/trunk@794 e93f8b46-1217-0410-a6f0-8f06a7374b81
20b4e226 · Jean-Philippe Lang · c3e3a189 · 20b4e226 · 20b4e226 · 20b4e226
Commit 20b4e226 authored Oct 03, 2007 by Jean-Philippe Lang
8 changed files
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -34,6 +34,7 @@ class ProjectsController < ApplicationController
  include CustomFieldsHelper   
  helper :ifpdf
  include IfpdfHelper
+  helper :issues
  helper IssuesHelper
  helper :queries
  include QueriesHelper

--- a/app/controllers/timelog_controller.rb
+++ b/app/controllers/timelog_controller.rb
@@ -21,6 +21,7 @@ class TimelogController < ApplicationController

  helper :sort
  include SortHelper
+  helper :issues
  
  def report
    @available_criterias = { 'version' => {:sql => "#{Issue.table_name}.fixed_version_id",

--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -70,8 +70,8 @@ module ApplicationHelper
  
  def format_date(date)
    return nil unless date
-    @date_format_setting ||= Setting.date_format.to_i
-    @date_format_setting == 0 ? l_date(date) : date.strftime("%Y-%m-%d")
+    @date_format ||= (Setting.date_format.to_i == 0 ? l(:general_fmt_date) : date.strftime("%Y-%m-%d"))
+    date.strftime(@date_format)
  end
  
  def format_time(time)

--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@ -17,6 +17,19 @@

 module IssuesHelper

+  def render_issue_tooltip(issue)
+    @cached_label_start_date ||= l(:field_start_date)
+    @cached_label_due_date ||= l(:field_due_date)
+    @cached_label_assigned_to ||= l(:field_assigned_to)
+    @cached_label_priority ||= l(:field_priority)
+    
+    link_to_issue(issue) + ": #{h(issue.subject)}<br /><br />" +
+      "<strong>#{@cached_label_start_date}</strong>: #{format_date(issue.start_date)}<br />" +
+      "<strong>#{@cached_label_due_date}</strong>: #{format_date(issue.due_date)}<br />" +
+      "<strong>#{@cached_label_assigned_to}</strong>: #{issue.assigned_to}<br />" +
+      "<strong>#{@cached_label_priority}</strong>: #{issue.priority.name}"
+  end
+
  def show_detail(detail, no_html=false)
    case detail.property
    when 'attr'

--- a/app/views/issues/_tooltip.rhtml
+++ b/app/views/issues/_tooltip.rhtml
-<%= link_to_issue issue %></strong>: <%=h issue.subject %><br />
-<br />
-<strong><%= l(:field_start_date) %></strong>: <%= format_date(issue.start_date) %><br />
-<strong><%= l(:field_due_date) %></strong>: <%= format_date(issue.due_date) %><br />
-<strong><%= l(:field_assigned_to) %></strong>: <%= issue.assigned_to ? issue.assigned_to.name : "-" %><br />
-<strong><%= l(:field_priority) %></strong>: <%= issue.priority.name %>
--- a/app/views/projects/calendar.rhtml
+++ b/app/views/projects/calendar.rhtml
@@ -49,7 +49,7 @@ while day <= @date_to
        <%= h(truncate(i.subject, 30)) %>
 		</small>
        <span class="tip">
-        <%= render :partial => "issues/tooltip", :locals => { :issue => i }%>
+        <%= render_issue_tooltip i %>
        </span>		
 		</div>
 		<% else %>

--- a/app/views/projects/gantt.rhtml
+++ b/app/views/projects/gantt.rhtml
@@ -192,7 +192,7 @@ top = headers_height + 10
 	<% # === tooltip === %>
 	<div class="tooltip" style="position: absolute;top:<%= top %>px;left:<%= i_left %>px;width:<%= i_width %>px;height:12px;">
 	<span class="tip">
-    <%= render :partial => "issues/tooltip", :locals => { :issue => i }%>
+    <%= render_issue_tooltip i %>
 	</span></div>
 <% else 
    i_left = ((i.start_date - @date_from)*zoom).floor

--- a/app/views/timelog/details.rhtml
+++ b/app/views/timelog/details.rhtml
@@ -29,9 +29,9 @@
 <td align="center">
    <% if entry.issue %>
    <div class="tooltip">
-    <%= link_to "#{entry.issue.tracker.name} ##{entry.issue.id}", {:action => 'details', :issue_id => entry.issue } %>
+    <%= link_to_issue entry.issue %>
    <span class="tip">
-    <%= render :partial => "issues/tooltip", :locals => { :issue => entry.issue }%>
+    <%= render_issue_tooltip entry.issue %>
    </span>		
 	</div>
 	<% end %>