From 4973350243ba013998b567ebe604338b98c32ea3 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sat, 9 Jun 2012 13:45:55 +0000 Subject: [PATCH] Merged r9783 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.0-stable@9789 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/models/time_entry.rb | 2 +- test/integration/api_test/time_entries_test.rb | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/app/models/time_entry.rb b/app/models/time_entry.rb index 9008965af..ef085d875 100644 --- a/app/models/time_entry.rb +++ b/app/models/time_entry.rb @@ -66,7 +66,7 @@ class TimeEntry < ActiveRecord::Base end } - safe_attributes 'hours', 'comments', 'issue_id', 'activity_id', 'spent_on', 'custom_field_values' + safe_attributes 'hours', 'comments', 'issue_id', 'activity_id', 'spent_on', 'custom_field_values', 'custom_fields' def initialize(attributes=nil, *args) super diff --git a/test/integration/api_test/time_entries_test.rb b/test/integration/api_test/time_entries_test.rb index 7a220678c..b18013496 100644 --- a/test/integration/api_test/time_entries_test.rb +++ b/test/integration/api_test/time_entries_test.rb @@ -79,6 +79,21 @@ class ApiTest::TimeEntriesTest < ActionController::IntegrationTest assert_equal 3.5, entry.hours assert_equal TimeEntryActivity.find(11), entry.activity end + + should "accept custom fields" do + field = TimeEntryCustomField.create!(:name => 'Test', :field_format => 'string') + + assert_difference 'TimeEntry.count' do + post '/time_entries.xml', {:time_entry => { + :issue_id => '1', :spent_on => '2010-12-02', :hours => '3.5', :activity_id => '11', :custom_fields => [{:id => field.id.to_s, :value => 'accepted'}] + }}, credentials('jsmith') + end + assert_response :created + assert_equal 'application/xml', @response.content_type + + entry = TimeEntry.first(:order => 'id DESC') + assert_equal 'accepted', entry.custom_field_value(field) + end end context "with project_id" do