summaryrefslogtreecommitdiffstats
path: root/app/views/timelog
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2012-02-01 21:15:13 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2012-02-01 21:15:13 +0000
commitb13f85e456bba57e5d7079eb00cb594aab60406b (patch)
treef97a240f72dce611d2e814fac42cc77946011b2a /app/views/timelog
parent2808adf99f44d1329b1c12c60ecdb6c4105fca5d (diff)
downloadredmine-b13f85e456bba57e5d7079eb00cb594aab60406b.tar.gz
redmine-b13f85e456bba57e5d7079eb00cb594aab60406b.zip
Adds custom field in TimeEntry API responses (#10131).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8748 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views/timelog')
-rw-r--r--app/views/timelog/index.api.rsb2
-rw-r--r--app/views/timelog/show.api.rsb2
2 files changed, 4 insertions, 0 deletions
diff --git a/app/views/timelog/index.api.rsb b/app/views/timelog/index.api.rsb
index 213dbd362..d281e89b2 100644
--- a/app/views/timelog/index.api.rsb
+++ b/app/views/timelog/index.api.rsb
@@ -11,6 +11,8 @@ api.array :time_entries, api_meta(:total_count => @entry_count, :offset => @offs
api.spent_on time_entry.spent_on
api.created_on time_entry.created_on
api.updated_on time_entry.updated_on
+
+ render_api_custom_values time_entry.custom_field_values, api
end
end
end
diff --git a/app/views/timelog/show.api.rsb b/app/views/timelog/show.api.rsb
index d5d3c5d26..7fce2529a 100644
--- a/app/views/timelog/show.api.rsb
+++ b/app/views/timelog/show.api.rsb
@@ -9,4 +9,6 @@ api.time_entry do
api.spent_on @time_entry.spent_on
api.created_on @time_entry.created_on
api.updated_on @time_entry.updated_on
+
+ render_api_custom_values @time_entry.custom_field_values, api
end