added back "fixed version" in issue/show and filters

git-svn-id: http://redmine.rubyforge.org/svn/trunk@165 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/models/query.rb b/app/models/query.rb
index 4ac34bd6d5096fbafa0db354476ddc678ab67978..dbde65a15e193cd5a741e6f24e08c55b50c002a2 100644 (file)
--- a/app/models/query.rb
+++ b/app/models/query.rb
@@ -72,16 +72,17 @@ class Query < ActiveRecord::Base
     @available_filters = { "status_id" => { :type => :list_status, :order => 1, :values => IssueStatus.find(:all).collect{|s| [s.name, s.id.to_s] } },       
                            "tracker_id" => { :type => :list, :order => 2, :values => Tracker.find(:all).collect{|s| [s.name, s.id.to_s] } },                                                                                                                
                            "priority_id" => { :type => :list, :order => 3, :values => Enumeration.find(:all, :conditions => ['opt=?','IPRI']).collect{|s| [s.name, s.id.to_s] } },
-                           "subject" => { :type => :text, :order => 7 },  
-                           "created_on" => { :type => :date_past, :order => 8 },                        
-                           "updated_on" => { :type => :date_past, :order => 9 },
-                           "start_date" => { :type => :date, :order => 10 },
-                           "due_date" => { :type => :date, :order => 11 } }                          
+                           "subject" => { :type => :text, :order => 8 },  
+                           "created_on" => { :type => :date_past, :order => 9 },                        
+                           "updated_on" => { :type => :date_past, :order => 10 },
+                           "start_date" => { :type => :date, :order => 11 },
+                           "due_date" => { :type => :date, :order => 12 } }                          
     unless project.nil?
       # project specific filters
       @available_filters["assigned_to_id"] = { :type => :list_optional, :order => 4, :values => @project.users.collect{|s| [s.name, s.id.to_s] } }  
       @available_filters["author_id"] = { :type => :list, :order => 5, :values => @project.users.collect{|s| [s.name, s.id.to_s] } }  
       @available_filters["category_id"] = { :type => :list_optional, :order => 6, :values => @project.issue_categories.collect{|s| [s.name, s.id.to_s] } }
+      @available_filters["fixed_version_id"] = { :type => :list_optional, :order => 7, :values => @project.versions.collect{|s| [s.name, s.id.to_s] } }
       # remove category filter if no category defined
       @available_filters.delete "category_id" if @available_filters["category_id"][:values].empty?
     end

diff --git a/app/views/issues/show.rhtml b/app/views/issues/show.rhtml
index f7b8cda4bfda4144758f349347d0d64720e88fc2..f2441f9641c9161fc4ee6274f41cd3967a8735e7 100644 (file)
--- a/app/views/issues/show.rhtml
+++ b/app/views/issues/show.rhtml
@@ -26,6 +26,10 @@
     <td><b><%=l(:field_updated_on)%> :</b></td><td><%= format_date(@issue.updated_on) %></td>\r
     <td><b><%=l(:field_done_ratio)%> :</b></td><td><%= @issue.done_ratio %> %</td>\r
 </tr>\r
+<tr>\r
+    <td><b><%=l(:field_fixed_version)%> :</b></td><td><%= @issue.fixed_version ? @issue.fixed_version.name : "-" %></td>\r
+    <td></td><td></td>\r
+</tr>\r
 <tr>\r
 <% n = 0\r
 for custom_value in @custom_values %>\r