diff app/helpers/timelog_helper.rb @ 1517:dffacf8a6908 redmine-2.5

Update to Redmine SVN revision 13367 on 2.5-stable branch
author Chris Cannam
date Tue, 09 Sep 2014 09:29:00 +0100
parents e248c7af89ec
children
line wrap: on
line diff
--- a/app/helpers/timelog_helper.rb	Tue Sep 09 09:28:31 2014 +0100
+++ b/app/helpers/timelog_helper.rb	Tue Sep 09 09:29:00 2014 +0100
@@ -96,8 +96,10 @@
       else
         obj
       end
+    elsif cf = criteria_options[:custom_field]
+      format_value(value, cf)
     else
-      format_value(value, criteria_options[:format])
+      value.to_s
     end
   end