jro_apps/redmine Commit - r2250:764393aa6ac2

Merged r2250 and r2251 from trunk....

Jean-Philippe Lang -

r2250:764393aa6ac2

parent child

Context file:

r2250:764393aa6ac2

app/helpers/issues_helper.rb +1 0

               # Returns a string of css classes that apply to the given issue
               def css_issue_classes(issue)
                 s = "issue status-#{issue.status.position} priority-#{issue.priority.position}"
+                s << ' closed' if issue.closed?
                 s << ' overdue' if issue.overdue?
                 s
               end

app/models/time_entry.rb +2 -2

                             :description => :comments
               validates_presence_of :user_id, :activity_id, :project_id, :hours, :spent_on
-              validates_numericality_of :hours, :allow_nil => true
+              validates_numericality_of :hours, :allow_nil => true, :message => :activerecord_error_invalid
               validates_length_of :comments, :maximum => 255, :allow_nil => true
               def after_initialize
               end
               def hours=(h)
-                write_attribute :hours, (h.is_a?(String) ? h.to_hours : h)
+                write_attribute :hours, (h.is_a?(String) ? (h.to_hours || h) : h)
               end
               # tyear, tmonth, tweek assigned where setting spent_on attributes

lib/redmine/core_ext/string/conversions.rb +3 -1

                     def to_hours
                       s = self.dup
                       s.strip!
-                      unless s =~ %r{^[\d\.,]+$}
+                      if s =~ %r{^(\d+([.,]\d+)?)h?$}
+                        s = $1
+                      else
                         # 2:30 => 2.5
                         s.gsub!(%r{^(\d+):(\d+)$}) { $1.to_i + $2.to_i / 60.0 }
                         # 2h30, 2h, 30m => 2.5, 2, 0.5

test/functional/issues_controller_test.rb +18 0

@@ -596,6 +596,24 class IssuesControllerTest < Test::Unit::TestCase
596	# No email should be sent	596	# No email should be sent
597	assert ActionMailer::Base.deliveries.empty?	597	assert ActionMailer::Base.deliveries.empty?
598	end	598	end
		599
		600	def test_post_edit_with_invalid_spent_time
		601	@request.session[:user_id] = 2
		602	notes = 'Note added by IssuesControllerTest#test_post_edit_with_invalid_spent_time'
		603
		604	assert_no_difference('Journal.count') do
		605	post :edit,
		606	:id => 1,
		607	:notes => notes,
		608	:time_entry => {"comments"=>"", "activity_id"=>"", "hours"=>"2z"}
		609	end
		610	assert_response :success
		611	assert_template 'edit'
		612
		613	assert_tag :textarea, :attributes => { :name => 'notes' },
		614	:content => notes
		615	assert_tag :input, :attributes => { :name => 'time_entry[hours]', :value => "2z" }
		616	end
599		617
600	def test_bulk_edit	618	def test_bulk_edit
601	@request.session[:user_id] = 2	619	@request.session[:user_id] = 2

test/unit/time_entry_test.rb +2 -1

                 assertions = { "2"      => 2.0,
                                "21.1"   => 21.1,
                                "2,1"    => 2.1,
+                               "1,5h"   => 1.5,
                                "7:12"   => 7.2,
                                "10h"    => 10.0,
                                "10 h"   => 10.0,
                 assertions.each do |k, v|
                   t = TimeEntry.new(:hours => k)
-                  assert_equal v, t.hours
+                  assert_equal v, t.hours, "Converting #{k} failed:"
                 end
               end
             end

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