summaryrefslogtreecommitdiffstats
path: root/app/views/issues
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2010-12-10 10:12:19 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2010-12-10 10:12:19 +0000
commit0e19aa4362a0524d900044fc9dc69e177337eca0 (patch)
treed5b9120bfab84d78beb68cb38ab6d2b8a462c3df /app/views/issues
parent8524d505c5c092ead4f6be1fedfc38311b3c7b91 (diff)
downloadredmine-0e19aa4362a0524d900044fc9dc69e177337eca0.tar.gz
redmine-0e19aa4362a0524d900044fc9dc69e177337eca0.zip
Fixed: error when serializing back objects with custom fields using ActiveResource (#6403).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4480 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views/issues')
-rw-r--r--app/views/issues/index.api.rsb6
-rw-r--r--app/views/issues/show.api.rsb6
2 files changed, 2 insertions, 10 deletions
diff --git a/app/views/issues/index.api.rsb b/app/views/issues/index.api.rsb
index a63b07a09..f30ee55bb 100644
--- a/app/views/issues/index.api.rsb
+++ b/app/views/issues/index.api.rsb
@@ -19,11 +19,7 @@ api.array :issues do
api.done_ratio issue.done_ratio
api.estimated_hours issue.estimated_hours
- api.array :custom_fields do
- issue.custom_field_values.each do |custom_value|
- api.custom_field custom_value.value, :id => custom_value.custom_field_id, :name => custom_value.custom_field.name
- end
- end
+ render_api_custom_values issue.custom_field_values, api
api.created_on issue.created_on
api.updated_on issue.updated_on
diff --git a/app/views/issues/show.api.rsb b/app/views/issues/show.api.rsb
index 001cabe11..02e7fdd29 100644
--- a/app/views/issues/show.api.rsb
+++ b/app/views/issues/show.api.rsb
@@ -20,11 +20,7 @@ api.issue do
api.spent_hours @issue.spent_hours
end
- api.array :custom_fields do
- @issue.custom_field_values.each do |custom_value|
- api.custom_field custom_value.value, :id => custom_value.custom_field_id, :name => custom_value.custom_field.name
- end
- end unless @issue.custom_field_values.empty?
+ render_api_custom_values @issue.custom_field_values, api
api.created_on @issue.created_on
api.updated_on @issue.updated_on