| @@ -164,8 +164,6 class Query < ActiveRecord::Base | |||
|
|
164 | 164 | end |
|
|
165 | 165 | @project.all_custom_fields.select(&:is_filter?).each do |field| |
|
|
166 | 166 | case field.field_format |
|
|
167 | when "string", "int" | |
|
|
168 | options = { :type => :string, :order => 20 } | |
|
|
169 | 167 | when "text" |
|
|
170 | 168 | options = { :type => :text, :order => 20 } |
|
|
171 | 169 | when "list" |
| @@ -174,6 +172,8 class Query < ActiveRecord::Base | |||
|
|
174 | 172 | options = { :type => :date, :order => 20 } |
|
|
175 | 173 | when "bool" |
|
|
176 | 174 | options = { :type => :list, :values => [[l(:general_text_yes), "1"], [l(:general_text_no), "0"]], :order => 20 } |
|
|
175 | else | |
|
|
176 | options = { :type => :string, :order => 20 } | |
|
|
177 | 177 | end |
|
|
178 | 178 | @available_filters["cf_#{field.id}"] = options.merge({ :name => field.name }) |
|
|
179 | 179 | end |
| @@ -26,6 +26,5 | |||
|
|
26 | 26 | </div> |
|
|
27 | 27 | |
|
|
28 | 28 | <% content_for :header_tags do %> |
|
|
29 |
<%= auto_discovery_link_tag(: |
|
|
|
30 | <%= auto_discovery_link_tag(:atom, {:controller => 'feeds', :action => 'news', :key => @key, :format => 'atom'}, {:title => l(:label_news_latest)}) %> | |
|
|
29 | <%= auto_discovery_link_tag(:atom, {:controller => 'news', :action => 'index', :key => User.current.rss_key, :format => 'atom'}, {:title => l(:label_news_latest)}) %> | |
|
|
31 | 30 | <% end %> |
| @@ -91,7 +91,7 module Redmine | |||
|
|
91 | 91 | :author => changeset[:user], |
|
|
92 | 92 | :time => Time.parse(changeset[:date]), |
|
|
93 | 93 | :message => changeset[:description], |
|
|
94 | :paths => changeset[:files].split.collect{|path| {:action => 'X', :path => "/#{path}"}} | |
|
|
94 | :paths => changeset[:files].to_s.split.collect{|path| {:action => 'X', :path => "/#{path}"}} | |
|
|
95 | 95 | }) |
|
|
96 | 96 | changeset = {} |
|
|
97 | 97 | end |
General Comments 0
You need to be logged in to leave comments.
Login now