jro_apps/redmine Commit - r2450:57d10ed89396

Merged r2262, r2341 and r2486 from trunk....

Jean-Philippe Lang -

r2450:57d10ed89396

parent child

Context file:

r2450:57d10ed89396

app/helpers/application_helper.rb +5 -5

                   full_messages = []
                   object.errors.each do |attr, msg|
                     next if msg.nil?
-                    msg = msg.first if msg.is_a? Array
+                    msg = [msg] unless msg.is_a?(Array)
                     if attr == "base"
-                      full_messages << l(msg)
+                      full_messages << l(*msg)
                     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
                   # retrieve custom values error messages
                     object.custom_values.each do |v|
                       v.errors.each do |attr, msg|
                         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

app/views/layouts/base.rhtml +1 -1

             <div id="ajax-indicator" style="display:none;"><span><%= l(:label_loading) %></span></div>
             <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>
             <%= call_hook :view_layouts_base_body_bottom %>

doc/CHANGELOG +3 0

             * Send an email to the user when an administrator activates a registered user
             * 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

lib/redmine/export/pdf.rb +2 0

             module Redmine
               module Export
                 module PDF
+                  include ActionView::Helpers::NumberHelper
                   class IFPDF < FPDF
                     include GLoc
                     attr_accessor :footer_date

test/functional/issues_controller_test.rb +1 -1

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

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages