diff options
author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2015-03-15 09:49:35 +0000 |
---|---|---|
committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2015-03-15 09:49:35 +0000 |
commit | 6c5e5142dffd2a8161f5c6a8a81d2e5b7276acae (patch) | |
tree | 388801369bab6436f492ad9bb08e2c63becc4a46 /lib | |
parent | 50a8bd452bfdf914a3986cbc1336469287724c6f (diff) | |
download | redmine-6c5e5142dffd2a8161f5c6a8a81d2e5b7276acae.tar.gz redmine-6c5e5142dffd2a8161f5c6a8a81d2e5b7276acae.zip |
Don't include milliseconds in JSON API responses (#19354).
git-svn-id: http://svn.redmine.org/redmine/trunk@14101 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib')
-rw-r--r-- | lib/redmine/views/builders/structure.rb | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/lib/redmine/views/builders/structure.rb b/lib/redmine/views/builders/structure.rb index a420dc497..b11e255ec 100644 --- a/lib/redmine/views/builders/structure.rb +++ b/lib/redmine/views/builders/structure.rb @@ -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 |