jro_apps/redmine Commit - r11830:27c3299f3281

Fixed that open/closed counts on issues summary are not displayed with SQLServer (#14369)....

Jean-Philippe Lang -

r11830:27c3299f3281

parent child

Context file:

r11830:27c3299f3281

Collapse all files

app/helpers/reports_helper.rb +1 -1

             # encoding: utf-8
             #
             # Redmine - project management software
             # Copyright (C) 2006-2013  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"))
+                    match = 0 unless (row[k].to_s == v.to_s) || (k == 'closed' &&  (v == 0 ? ['f', false] : ['t', true]).include?(row[k]))
                   } 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(h(a), *args) : '-'
               end
               def aggregate_path(project, field, row, options={})
                 parameters = {:set_filter => 1, :subproject_id => '!*', field => row.id}.merge(options)
                 project_issues_path(row.is_a?(Project) ? row : project, parameters)
               end
             end

test/functional/reports_controller_test.rb +18 0

             # Redmine - project management software
             # Copyright (C) 2006-2013  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.
             require File.expand_path('../../test_helper', __FILE__)
             class ReportsControllerTest < ActionController::TestCase
               fixtures :projects, :trackers, :issue_statuses, :issues,
                        :enumerations, :users, :issue_categories,
                        :projects_trackers,
                        :roles,
                        :member_roles,
                        :members,
                        :enabled_modules,
                        :versions
               def test_get_issue_report
                 get :issue_report, :id => 1
                 assert_response :success
                 assert_template 'issue_report'
                 [:issues_by_tracker, :issues_by_version, :issues_by_category, :issues_by_assigned_to,
                  :issues_by_author, :issues_by_subproject, :issues_by_priority].each do |ivar|
                   assert_not_nil assigns(ivar)
                 end
                 assert_equal IssuePriority.all.reverse, assigns(:priorities)
               end
               def test_get_issue_report_details
                 %w(tracker version priority category assigned_to author subproject).each do |detail|
                   get :issue_report_details, :id => 1, :detail => detail
                   assert_response :success
                   assert_template 'issue_report_details'
                   assert_not_nil assigns(:field)
                   assert_not_nil assigns(:rows)
                   assert_not_nil assigns(:data)
                   assert_not_nil assigns(:report_title)
                 end
               end
+              def test_get_issue_report_details_by_tracker_should_show_issue_count
+                Issue.delete_all
+                Issue.generate!(:tracker_id => 1)
+                Issue.generate!(:tracker_id => 1)
+                Issue.generate!(:tracker_id => 1, :status_id => 5)
+                Issue.generate!(:tracker_id => 2)
+                get :issue_report_details, :id => 1, :detail => 'tracker'
+                assert_select 'table.list tbody :nth-child(1)' do
+                  assert_select 'td', :text => 'Bug'
+                  assert_select ':nth-child(2)', :text => '2' # status:1
+                  assert_select ':nth-child(3)', :text => '-' # status:2
+                  assert_select ':nth-child(8)', :text => '2' # open
+                  assert_select ':nth-child(9)', :text => '1' # closed
+                  assert_select ':nth-child(10)', :text => '3' # total
+                end
+              end
               def test_get_issue_report_details_by_priority
                 get :issue_report_details, :id => 1, :detail => 'priority'
                 assert_equal IssuePriority.all.reverse, assigns(:rows)
               end
               def test_get_issue_report_details_with_an_invalid_detail
                 get :issue_report_details, :id => 1, :detail => 'invalid'
                 assert_redirected_to '/projects/ecookbook/issues/report'
               end
             end

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