From bc3bd8aff2a7468a87211775be679b96e5c509dc Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Tue, 4 Nov 2014 21:00:59 +0000 Subject: Let QueryColumn accept a Proc as caption (#18276). git-svn-id: http://svn.redmine.org/redmine/trunk@13558 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/models/query.rb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'app/models/query.rb') diff --git a/app/models/query.rb b/app/models/query.rb index a4d34d1e4..755c41db3 100644 --- a/app/models/query.rb +++ b/app/models/query.rb @@ -33,7 +33,14 @@ class QueryColumn end def caption - @caption_key.is_a?(Symbol) ? l(@caption_key) : @caption_key + case @caption_key + when Symbol + l(@caption_key) + when Proc + @caption_key.call + else + @caption_key + end end # Returns true if the column is sortable, otherwise false -- cgit v1.2.3