WIP - custom fields mainly displaying but needs to be reworked.

app/assets/javascripts/angular/helpers/components/work-packages-helper.js

@@ -30,7 +30,7 @@ angular.module('openproject.workPackages.helpers')
       if (!object.custom_values) return null;
 
       var customValue = object.custom_values.filter(function(customValue){
-        return customValue.custom_field_id === customField.id;
+        return customValue && customValue.custom_field_id === customField.id;
       }).first();
 
       if(customValue) {

app/controllers/api/v3/work_packages_controller.rb

@@ -133,7 +133,8 @@ module Api
           custom_field = CustomField.find($1)
           work_packages.map do |work_package|
             custom_value = work_package.custom_values.find_by_custom_field_id($1)
-            custom_field.cast_value custom_value.try(:value)
+            # custom_field.cast_value custom_value.try(:value)
+            work_package.custom_value_display(custom_value)
           end
         else
           work_packages.map do |work_package|

app/models/work_package.rb

@@ -719,16 +719,16 @@ class WorkPackage < ActiveRecord::Base
   # TODO RS: This probably isn't the right place for display helpers. It's convenient though to have
   #          the method on the model so that it can be used in the rabl template.
   def get_custom_value_display_data(custom_field)
-    display_custom_value(custom_values.find_by_custom_field_id(custom_field.id))
+    custom_value_display(custom_values.find_by_custom_field_id(custom_field.id))
   end
 
-  def custom_values_display_data
+  def custom_values_display_data(field_names)
-    custom_values.map do |custom_value|
+    field_names.map do |field_name|
-      display_custom_value(custom_value)
+      custom_value_display(custom_values.find_by_custom_field_id(field_name.to_s.gsub('cf_','')))
     end
   end
 
-  def display_custom_value(custom_value)
+  def custom_value_display(custom_value)
     if !custom_value.nil?
       {
         custom_field_id: custom_value.custom_field.id,

app/views/api/v3/work_packages/index.api.rabl

@@ -53,7 +53,7 @@ child @work_packages => :work_packages do
   end
 
   node(:custom_values) do |wp|
-    wp.custom_values_display_data
+    wp.custom_values_display_data @custom_field_column_names
   end
 end