jro_apps/redmine Commit - r626:b3f3634df3de

On the issue report page, 0 issue counts are now displayed as dashes....

Jean-Philippe Lang -

r626:b3f3634df3de

parent child

Context file:

r626:b3f3634df3de

Collapse all files

app/helpers/reports_helper.rb +4 0

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             module ReportsHelper
               def aggregate(data, criteria)
                 a = 0
                 data.each { |row|
                   match = 1
                   criteria.each { |k, v|
                     match = 0 unless (row[k].to_s == v.to_s) || (k == 'closed' && row[k] == (v == 0 ? "f" : "t"))
                   } unless criteria.nil?
                   a = a + row["total"].to_i if match == 1
                 } unless data.nil?
                 a
               end
+              def aggregate_link(data, criteria, *args)
+                a = aggregate data, criteria
+                a > 0 ? link_to(a, *args) : '-'
+              end
             end

app/views/reports/_details.rhtml +4 -4

             <% if @statuses.empty? or rows.empty? %>
                 <p><i><%=l(:label_no_data)%></i></p>
             <% else %>
             <% col_width = 70 / (@statuses.length+3) %>
             <table class="list">
             <thead><tr>
             <th style="width:25%"></th>
             <% for status in @statuses %>
             <th style="text-align:left;width:<%= col_width %>%"><div class="square" style="background:#<%= status.html_color %>;"></div> <small><%= status.name %></small></th>
             <% end %>
             <th align="center" style="width:<%= col_width %>%"><strong><%=l(:label_open_issues_plural)%></strong></th>
             <th align="center" style="width:<%= col_width %>%"><strong><%=l(:label_closed_issues_plural)%></strong></th>
             <th align="center" style="width:<%= col_width %>%"><strong><%=l(:label_total)%></strong></th>
             </tr></thead>
             <tbody>
             <% for row in rows %>
             <tr class="<%= cycle("odd", "even") %>">
               <td><%= link_to row.name, :controller => 'projects', :action => 'list_issues', :id => ((row.is_a?(Project) ? row : @project)),
                                                             :set_filter => 1,
                                                             "#{field_name}" => row.id %></td>
               <% for status in @statuses %>
-                <td align="center"><%= link_to (aggregate data, { field_name => row.id, "status_id" => status.id }),
+                <td align="center"><%= aggregate_link data, { field_name => row.id, "status_id" => status.id },
                                                             :controller => 'projects', :action => 'list_issues', :id => ((row.is_a?(Project) ? row : @project)),
                                                             :set_filter => 1,
                                                             "status_id" => status.id,
                                                             "#{field_name}" => row.id %></td>
               <% end %>
-              <td align="center"><%= link_to (aggregate data, { field_name => row.id, "closed" => 0 }),
+              <td align="center"><%= aggregate_link data, { field_name => row.id, "closed" => 0 },
                                                             :controller => 'projects', :action => 'list_issues', :id => ((row.is_a?(Project) ? row : @project)),
                                                             :set_filter => 1,
                                                             "#{field_name}" => row.id,
                                                             "status_id" => "o" %></td>
-              <td align="center"><%= link_to (aggregate data, { field_name => row.id, "closed" => 1 }),
+              <td align="center"><%= aggregate_link data, { field_name => row.id, "closed" => 1 },
                                                             :controller => 'projects', :action => 'list_issues', :id => ((row.is_a?(Project) ? row : @project)),
                                                             :set_filter => 1,
                                                             "#{field_name}" => row.id,
                                                             "status_id" => "c" %></td>
-              <td align="center"><%= link_to (aggregate data, { field_name => row.id }),
+              <td align="center"><%= aggregate_link data, { field_name => row.id },
                                                             :controller => 'projects', :action => 'list_issues', :id => ((row.is_a?(Project) ? row : @project)),
                                                             :set_filter => 1,
                                                             "#{field_name}" => row.id,
                                                             "status_id" => "*" %></td>
             </tr>
             <% end %>
             </tbody>
             </table>
             <% end
               reset_cycle %>

app/views/reports/_simple.rhtml +3 -3

             <% if @statuses.empty? or rows.empty? %>
                 <p><i><%=l(:label_no_data)%></i></p>
             <% else %>
             <table class="list">
             <thead><tr>
             <th style="width:25%"></th>
             <th align="center" style="width:25%"><%=l(:label_open_issues_plural)%></th>
             <th align="center" style="width:25%"><%=l(:label_closed_issues_plural)%></th>
             <th align="center" style="width:25%"><%=l(:label_total)%></th>
             </tr></thead>
             <tbody>
             <% for row in rows %>
             <tr class="<%= cycle("odd", "even") %>">
               <td><%= link_to row.name, :controller => 'projects', :action => 'list_issues', :id => ((row.is_a?(Project) ? row : @project)),
                                                             :set_filter => 1,
                                                             "#{field_name}" => row.id %></td>
-              <td align="center"><%= link_to (aggregate data, { field_name => row.id, "closed" => 0 }),
+              <td align="center"><%= aggregate_link data, { field_name => row.id, "closed" => 0 },
                                                             :controller => 'projects', :action => 'list_issues', :id => ((row.is_a?(Project) ? row : @project)),
                                                             :set_filter => 1,
                                                             "#{field_name}" => row.id,
                                                             "status_id" => "o" %></td>
-              <td align="center"><%= link_to (aggregate data, { field_name => row.id, "closed" => 1 }),
+              <td align="center"><%= aggregate_link data, { field_name => row.id, "closed" => 1 },
                                                             :controller => 'projects', :action => 'list_issues', :id => ((row.is_a?(Project) ? row : @project)),
                                                             :set_filter => 1,
                                                             "#{field_name}" => row.id,
                                                             "status_id" => "c" %></td>
-              <td align="center"><%= link_to (aggregate data, { field_name => row.id }),
+              <td align="center"><%= aggregate_link data, { field_name => row.id },
                                                             :controller => 'projects', :action => 'list_issues', :id => ((row.is_a?(Project) ? row : @project)),
                                                             :set_filter => 1,
                                                             "#{field_name}" => row.id,
                                                             "status_id" => "*" %></td>
             </tr>
             <% end %>
             </tbody>
             </table>
             <% end
               reset_cycle %>

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages