Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-11-15 09:46:02 +01:00
Code Issues Packages Projects Releases Activity

Don't include milliseconds in JSON API responses (#19354).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@14101 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2015-03-15 09:49:35 +00:00
parent 50a8bd452b
commit 6c5e5142df
2 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/redmine/views/builders/structure.rb
View File

@@ -37,6 +37,16 @@ module Redmine
@struct.last.merge!(options) if options
end
def encode_value(value)
if value.is_a?(Time)
# Rails uses a global setting to format JSON times
# Don't rely on it for the API as it could have been changed
value.xmlschema(0)
else
value
end
end
def method_missing(sym, *args, &block)
if args.any?
if args.first.is_a?(Hash)
@@ -46,14 +56,15 @@ module Redmine
@struct.last[sym] = args.first
end
else
value = encode_value(args.first)
if @struct.last.is_a?(Array)
if args.size == 1 && !block_given?
@struct.last << args.first
@struct.last << value
else
@struct.last << (args.last || {}).merge(:value => args.first)
@struct.last << (args.last || {}).merge(:value => value)
end
else
@struct.last[sym] = args.first
@struct.last[sym] = value
end
end
end

10
test/integration/api_test/api_test.rb
View File

@@ -34,4 +34,14 @@ class Redmine::ApiTest::ApiTest < Redmine::ApiTest::Base
ensure
ActionController::Base.allow_forgery_protection = false
end
def test_json_datetime_format
get '/users/1.json', {}, credentials('admin')
assert_include '"created_on":"2006-07-19T17:12:21Z"', response.body
end
def test_xml_datetime_format
get '/users/1.xml', {}, credentials('admin')
assert_include '<created_on>2006-07-19T17:12:21Z</created_on>', response.body
end
end