Merged r2262, r2341 and r2486 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/0.8-stable@2513 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2009-02-21 19:29:33 +00:00
parent 28e4ff8957
commit 57d10ed893
5 changed files with 12 additions and 7 deletions

View File

@ -487,11 +487,11 @@ module ApplicationHelper
full_messages = [] full_messages = []
object.errors.each do |attr, msg| object.errors.each do |attr, msg|
next if msg.nil? next if msg.nil?
msg = msg.first if msg.is_a? Array msg = [msg] unless msg.is_a?(Array)
if attr == "base" if attr == "base"
full_messages << l(msg) full_messages << l(*msg)
else else
full_messages << "&#171; " + (l_has_string?("field_" + attr) ? l("field_" + attr) : object.class.human_attribute_name(attr)) + " &#187; " + l(msg) unless attr == "custom_values" full_messages << "&#171; " + (l_has_string?("field_" + attr) ? l("field_" + attr) : object.class.human_attribute_name(attr)) + " &#187; " + l(*msg) unless attr == "custom_values"
end end
end end
# retrieve custom values error messages # retrieve custom values error messages
@ -499,8 +499,8 @@ module ApplicationHelper
object.custom_values.each do |v| object.custom_values.each do |v|
v.errors.each do |attr, msg| v.errors.each do |attr, msg|
next if msg.nil? next if msg.nil?
msg = msg.first if msg.is_a? Array msg = [msg] unless msg.is_a?(Array)
full_messages << "&#171; " + v.custom_field.name + " &#187; " + l(msg) full_messages << "&#171; " + v.custom_field.name + " &#187; " + l(*msg)
end end
end end
end end

View File

@ -58,7 +58,7 @@
<div id="ajax-indicator" style="display:none;"><span><%= l(:label_loading) %></span></div> <div id="ajax-indicator" style="display:none;"><span><%= l(:label_loading) %></span></div>
<div id="footer"> <div id="footer">
Powered by <%= link_to Redmine::Info.app_name, Redmine::Info.url %> &copy; 2006-2008 Jean-Philippe Lang Powered by <%= link_to Redmine::Info.app_name, Redmine::Info.url %> &copy; 2006-2009 Jean-Philippe Lang
</div> </div>
</div> </div>
<%= call_hook :view_layouts_base_body_bottom %> <%= call_hook :view_layouts_base_body_bottom %>

View File

@ -9,6 +9,9 @@ http://www.redmine.org/
* Send an email to the user when an administrator activates a registered user * Send an email to the user when an administrator activates a registered user
* Strip keywords from received email body * Strip keywords from received email body
* Footer updated to 2009
* Fixed: exporting an issue with attachments to PDF raises an error
* Fixed: "too few arguments" error may occur on activerecord error translation
== 2009-02-15 v0.8.1 == 2009-02-15 v0.8.1

View File

@ -21,6 +21,8 @@ require 'rfpdf/chinese'
module Redmine module Redmine
module Export module Export
module PDF module PDF
include ActionView::Helpers::NumberHelper
class IFPDF < FPDF class IFPDF < FPDF
include GLoc include GLoc
attr_accessor :footer_date attr_accessor :footer_date

View File

@ -253,7 +253,7 @@ class IssuesControllerTest < Test::Unit::TestCase
end end
def test_show_export_to_pdf def test_show_export_to_pdf
get :show, :id => 1, :format => 'pdf' get :show, :id => 3, :format => 'pdf'
assert_response :success assert_response :success
assert_equal 'application/pdf', @response.content_type assert_equal 'application/pdf', @response.content_type
assert @response.body.starts_with?('%PDF') assert @response.body.starts_with?('%PDF')