From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 25 Jul 2010 09:34:04 +0000 (+0000)
Subject: Merged r3865 and r3866 from trunk.
X-Git-Tag: 1.0.1~82
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=69f34a595dc3094a3ebbb2de56e0551645866095;p=redmine.git

Merged r3865 and r3866 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3867 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/app/controllers/versions_controller.rb b/app/controllers/versions_controller.rb
index 05c9743eb..46b4778d4 100644
--- a/app/controllers/versions_controller.rb
+++ b/app/controllers/versions_controller.rb
@@ -27,6 +27,9 @@ class VersionsController < ApplicationController
   helper :projects
   
   def show
+    @issues = @version.fixed_issues.visible.find(:all,
+      :include => [:status, :tracker, :priority],
+      :order => "#{Tracker.table_name}.position, #{Issue.table_name}.id")
   end
   
   def new
diff --git a/app/views/versions/show.rhtml b/app/views/versions/show.rhtml
index 18bc6bc45..79de5984b 100644
--- a/app/views/versions/show.rhtml
+++ b/app/views/versions/show.rhtml
@@ -32,13 +32,10 @@
 <%= render :partial => 'versions/overview', :locals => {:version => @version} %>
 <%= render(:partial => "wiki/content", :locals => {:content => @version.wiki_page.content}) if @version.wiki_page %>
 
-<% issues = @version.fixed_issues.find(:all,
-                                       :include => [:status, :tracker, :priority],
-                                       :order => "#{Tracker.table_name}.position, #{Issue.table_name}.id") %>
-<% if issues.size > 0 %>
+<% if @issues.present? %>
 <fieldset class="related-issues"><legend><%= l(:label_related_issues) %></legend>
 <ul>
-<% issues.each do |issue| -%>
+<% @issues.each do |issue| -%>
     <li><%= link_to_issue(issue) %></li>
 <% end -%>
 </ul>