diff app/views/custom_fields/index.api.rsb @ 1517:dffacf8a6908 redmine-2.5

Update to Redmine SVN revision 13367 on 2.5-stable branch

--- a/app/views/custom_fields/index.api.rsb	Tue Sep 09 09:28:31 2014 +0100
+++ b/app/views/custom_fields/index.api.rsb	Tue Sep 09 09:29:00 2014 +0100
@@ -6,8 +6,8 @@
       api.customized_type   field.class.customized_class.name.underscore if field.class.customized_class
       api.field_format      field.field_format
       api.regexp            field.regexp
-      api.min_length        (field.min_length == 0 ? nil : field.min_length)
-      api.max_length        (field.max_length == 0 ? nil : field.max_length)
+      api.min_length        field.min_length
+      api.max_length        field.max_length
       api.is_required       field.is_required?
       api.is_filter         field.is_filter?
       api.searchable        field.searchable
@@ -15,23 +15,24 @@
       api.default_value     field.default_value
       api.visible           field.visible?
 
-      if field.field_format == 'list'
+      values = field.possible_values_options
+      if values.present?
         api.array :possible_values do
-          field.possible_values.each do |v|
+          values.each do |label, value|
             api.possible_value do
-              api.value v
+              api.value value || label
             end
           end
         end
       end
 
       if field.is_a?(IssueCustomField)
-        api.trackers do
+        api.array :trackers do
           field.trackers.each do |tracker|
             api.tracker :id => tracker.id, :name => tracker.name
           end
         end
-        api.roles do
+        api.array :roles do
           field.roles.each do |role|
             api.role :id => role.id, :name => role.name
           end