| @@ -72,16 +72,17 class Query < ActiveRecord::Base | |||
|
|
72 | 72 | @available_filters = { "status_id" => { :type => :list_status, :order => 1, :values => IssueStatus.find(:all).collect{|s| [s.name, s.id.to_s] } }, |
|
|
73 | 73 | "tracker_id" => { :type => :list, :order => 2, :values => Tracker.find(:all).collect{|s| [s.name, s.id.to_s] } }, |
|
|
74 | 74 | "priority_id" => { :type => :list, :order => 3, :values => Enumeration.find(:all, :conditions => ['opt=?','IPRI']).collect{|s| [s.name, s.id.to_s] } }, |
|
|
75 |
"subject" => { :type => :text, :order => |
|
|
|
76 |
"created_on" => { :type => :date_past, :order => |
|
|
|
77 |
"updated_on" => { :type => :date_past, :order => |
|
|
|
78 |
"start_date" => { :type => :date, :order => 1 |
|
|
|
79 |
"due_date" => { :type => :date, :order => 1 |
|
|
|
75 | "subject" => { :type => :text, :order => 8 }, | |
|
|
76 | "created_on" => { :type => :date_past, :order => 9 }, | |
|
|
77 | "updated_on" => { :type => :date_past, :order => 10 }, | |
|
|
78 | "start_date" => { :type => :date, :order => 11 }, | |
|
|
79 | "due_date" => { :type => :date, :order => 12 } } | |
|
|
80 | 80 | unless project.nil? |
|
|
81 | 81 | # project specific filters |
|
|
82 | 82 | @available_filters["assigned_to_id"] = { :type => :list_optional, :order => 4, :values => @project.users.collect{|s| [s.name, s.id.to_s] } } |
|
|
83 | 83 | @available_filters["author_id"] = { :type => :list, :order => 5, :values => @project.users.collect{|s| [s.name, s.id.to_s] } } |
|
|
84 | 84 | @available_filters["category_id"] = { :type => :list_optional, :order => 6, :values => @project.issue_categories.collect{|s| [s.name, s.id.to_s] } } |
|
|
85 | @available_filters["fixed_version_id"] = { :type => :list_optional, :order => 7, :values => @project.versions.collect{|s| [s.name, s.id.to_s] } } | |
|
|
85 | 86 | # remove category filter if no category defined |
|
|
86 | 87 | @available_filters.delete "category_id" if @available_filters["category_id"][:values].empty? |
|
|
87 | 88 | end |
| @@ -27,6 +27,10 | |||
|
|
27 | 27 | <td><b><%=l(:field_done_ratio)%> :</b></td><td><%= @issue.done_ratio %> %</td> |
|
|
28 | 28 | </tr> |
|
|
29 | 29 | <tr> |
|
|
30 | <td><b><%=l(:field_fixed_version)%> :</b></td><td><%= @issue.fixed_version ? @issue.fixed_version.name : "-" %></td> | |
|
|
31 | <td></td><td></td> | |
|
|
32 | </tr> | |
|
|
33 | <tr> | |
|
|
30 | 34 | <% n = 0 |
|
|
31 | 35 | for custom_value in @custom_values %> |
|
|
32 | 36 | <td><b><%= custom_value.custom_field.name %> :</b></td><td><%=h show_value custom_value %></td> |
General Comments 0
You need to be logged in to leave comments.
Login now