diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2008-04-09 17:45:39 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2008-04-09 17:45:39 +0000 |
| commit | a3c89d4f697e958956e129b6bc5f564c9197a89c (patch) | |
| tree | 7d08d8df3dcc7c822650fda850e3c28fcf3656a6 /app/views/timelog | |
| parent | f025b16be747bf7ab7b1cae470eca28b77f7ada9 (diff) | |
| download | redmine-a3c89d4f697e958956e129b6bc5f564c9197a89c.tar.gz redmine-a3c89d4f697e958956e129b6bc5f564c9197a89c.zip | |
Custom fields (list and boolean) can be used as criteria in time report (#1012).
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1340 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views/timelog')
| -rw-r--r-- | app/views/timelog/_report_criteria.rhtml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/timelog/_report_criteria.rhtml b/app/views/timelog/_report_criteria.rhtml index 661e1fdb8..94f3d20f9 100644 --- a/app/views/timelog/_report_criteria.rhtml +++ b/app/views/timelog/_report_criteria.rhtml @@ -1,9 +1,9 @@ -<% @hours.collect {|h| h[criterias[level]]}.uniq.each do |value| %> +<% @hours.collect {|h| h[criterias[level]].to_s}.uniq.each do |value| %> <% hours_for_value = select_hours(hours, criterias[level], value) -%> <% next if hours_for_value.empty? -%> <tr class="<%= cycle('odd', 'even') %> <%= 'last-level' unless criterias.length > level+1 %>"> <%= '<td></td>' * level %> -<td><%= value.nil? ? l(:label_none) : @available_criterias[criterias[level]][:klass].find_by_id(value) %></td> +<td><%= format_criteria_value(criterias[level], value) %></td> <%= '<td></td>' * (criterias.length - level - 1) -%> <% total = 0 -%> <% @periods.each do |period| -%> |