* Fixed: Error when displaying the issue list if a float custom field is marked as 'used as filter'
* Fixed: Mercurial adapter breaks on missing :files entry in changeset hash (James Britt) * Fixed: Wrong feed URLs on the home page git-svn-id: http://redmine.rubyforge.org/svn/trunk@921 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
8d91afc33e
commit
5e6fa147da
@ -164,8 +164,6 @@ class Query < ActiveRecord::Base
|
|||||||
end
|
end
|
||||||
@project.all_custom_fields.select(&:is_filter?).each do |field|
|
@project.all_custom_fields.select(&:is_filter?).each do |field|
|
||||||
case field.field_format
|
case field.field_format
|
||||||
when "string", "int"
|
|
||||||
options = { :type => :string, :order => 20 }
|
|
||||||
when "text"
|
when "text"
|
||||||
options = { :type => :text, :order => 20 }
|
options = { :type => :text, :order => 20 }
|
||||||
when "list"
|
when "list"
|
||||||
@ -174,6 +172,8 @@ class Query < ActiveRecord::Base
|
|||||||
options = { :type => :date, :order => 20 }
|
options = { :type => :date, :order => 20 }
|
||||||
when "bool"
|
when "bool"
|
||||||
options = { :type => :list, :values => [[l(:general_text_yes), "1"], [l(:general_text_no), "0"]], :order => 20 }
|
options = { :type => :list, :values => [[l(:general_text_yes), "1"], [l(:general_text_no), "0"]], :order => 20 }
|
||||||
|
else
|
||||||
|
options = { :type => :string, :order => 20 }
|
||||||
end
|
end
|
||||||
@available_filters["cf_#{field.id}"] = options.merge({ :name => field.name })
|
@available_filters["cf_#{field.id}"] = options.merge({ :name => field.name })
|
||||||
end
|
end
|
||||||
|
@ -26,6 +26,5 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<% content_for :header_tags do %>
|
<% content_for :header_tags do %>
|
||||||
<%= auto_discovery_link_tag(:rss, {:controller => 'feeds', :action => 'news', :key => @key}, {:title => l(:label_news_latest)}) %>
|
<%= auto_discovery_link_tag(:atom, {:controller => 'news', :action => 'index', :key => User.current.rss_key, :format => 'atom'}, {:title => l(:label_news_latest)}) %>
|
||||||
<%= auto_discovery_link_tag(:atom, {:controller => 'feeds', :action => 'news', :key => @key, :format => 'atom'}, {:title => l(:label_news_latest)}) %>
|
|
||||||
<% end %>
|
<% end %>
|
||||||
|
@ -91,7 +91,7 @@ module Redmine
|
|||||||
:author => changeset[:user],
|
:author => changeset[:user],
|
||||||
:time => Time.parse(changeset[:date]),
|
:time => Time.parse(changeset[:date]),
|
||||||
:message => changeset[:description],
|
:message => changeset[:description],
|
||||||
:paths => changeset[:files].split.collect{|path| {:action => 'X', :path => "/#{path}"}}
|
:paths => changeset[:files].to_s.split.collect{|path| {:action => 'X', :path => "/#{path}"}}
|
||||||
})
|
})
|
||||||
changeset = {}
|
changeset = {}
|
||||||
end
|
end
|
||||||
|
Loading…
x
Reference in New Issue
Block a user