jro_apps/redmine Commit - r10549:f909a8c006d0

Issues by Category should show tasks without category (#8106)....

Jean-Philippe Lang -

r10549:f909a8c006d0

parent child

Context file:

r10549:f909a8c006d0

Collapse all files

app/helpers/versions_helper.rb +2 -1

             # encoding: utf-8
             #
             # Redmine - project management software
             # Copyright (C) 2006-2012  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 VersionsHelper
               def version_anchor(version)
                 if @project == version.project
                   anchor version.name
                 else
                   anchor "#{version.project.try(:identifier)}-#{version.name}"
                 end
               end
               STATUS_BY_CRITERIAS = %w(tracker status priority author assigned_to category)
               def render_issue_status_by(version, criteria)
                 criteria = 'tracker' unless STATUS_BY_CRITERIAS.include?(criteria)
                 h = Hash.new {|k,v| k[v] = [0, 0]}
                 begin
                   # Total issue count
                   Issue.count(:group => criteria,
                               :conditions => ["#{Issue.table_name}.fixed_version_id = ?", version.id]).each {|c,s| h[c][0] = s}
                   # Open issues count
                   Issue.count(:group => criteria,
                               :include => :status,
                               :conditions => ["#{Issue.table_name}.fixed_version_id = ? AND #{IssueStatus.table_name}.is_closed = ?", version.id, false]).each {|c,s| h[c][1] = s}
                 rescue ActiveRecord::RecordNotFound
                 # When grouping by an association, Rails throws this exception if there's no result (bug)
                 end
-                counts = h.keys.compact.sort.collect {|k| {:group => k, :total => h[k][0], :open => h[k][1], :closed => (h[k][0] - h[k][1])}}
+                # Sort with nil keys in last position
+                counts = h.keys.sort {|a,b| a.nil? ? 1 : (b.nil? ? -1 : a <=> b)}.collect {|k| {:group => k, :total => h[k][0], :open => h[k][1], :closed => (h[k][0] - h[k][1])}}
                 max = counts.collect {|c| c[:total]}.max
                 render :partial => 'issue_counts', :locals => {:version => version, :criteria => criteria, :counts => counts, :max => max}
               end
               def status_by_options_for_select(value)
                 options_for_select(STATUS_BY_CRITERIAS.collect {|criteria| [l("field_#{criteria}".to_sym), criteria]}, value)
               end
             end

app/views/versions/_issue_counts.html.erb +5 -6

             <%= form_tag({}, :id => "status_by_form") do -%>
             <fieldset>
             <legend>
             <%= l(:label_issues_by,
                    select_tag('status_by',
                                status_by_options_for_select(criteria),
                                :id => 'status_by_select',
                                :data => {:remote => true, :method => 'post', :url => status_by_version_path(version)})).html_safe %>
             </legend>
             <% if counts.empty? %>
                 <p><em><%= l(:label_no_data) %></em></p>
             <% else %>
                 <table>
                 <% counts.each do |count| %>
                 <tr>
                     <td width="130px" align="right" >
-                        <%= link_to h(count[:group]), {:controller => 'issues',
+                    	<% if count[:group] -%>
-                                                    :action => 'index',
+                        <%= link_to(h(count[:group]), project_issues_path(version.project, :set_filter => 1, :status_id => '*', :fixed_version_id => version, "#{criteria}_id" => count[:group])) %>
-                                                    :project_id => version.project,
+            				  <% else -%>
-                                                    :set_filter => 1,
+                        <%= link_to(l(:label_none), project_issues_path(version.project, :set_filter => 1, :status_id => '*', :fixed_version_id => version, "#{criteria}_id" => "!*")) %>
-                                                    :status_id => '*',
+            				  <% end %>
-                                                    :fixed_version_id => version}.merge("#{criteria}_id".to_sym => count[:group]) %>
                     </td>
                     <td width="240px">
                         <%= progress_bar((count[:closed].to_f / count[:total])*100,
                               :legend => "#{count[:closed]}/#{count[:total]}",
                               :width => "#{(count[:total].to_f / max * 200).floor}px;") %>
                     </td>
                 </tr>
                 <% end %>
                 </table>
             <% end %>
             </fieldset>
             <% end %>

test/functional/versions_controller_test.rb +14 -1

             # Redmine - project management software
             # Copyright (C) 2006-2012  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__)
             require 'versions_controller'
             # Re-raise errors caught by the controller.
             class VersionsController; def rescue_action(e) raise e end; end
             class VersionsControllerTest < ActionController::TestCase
-              fixtures :projects, :versions, :issues, :users, :roles, :members, :member_roles, :enabled_modules, :issue_statuses
+              fixtures :projects, :versions, :issues, :users, :roles, :members, :member_roles, :enabled_modules, :issue_statuses, :issue_categories
               def setup
                 @controller = VersionsController.new
                 @request    = ActionController::TestRequest.new
                 @response   = ActionController::TestResponse.new
                 User.current = nil
               end
               def test_index
                 get :index, :project_id => 1
                 assert_response :success
                 assert_template 'index'
                 assert_not_nil assigns(:versions)
                 # Version with no date set appears
                 assert assigns(:versions).include?(Version.find(3))
                 # Completed version doesn't appear
                 assert !assigns(:versions).include?(Version.find(1))
                 # Context menu on issues
                 assert_select "script", :text => Regexp.new(Regexp.escape("contextMenuInit('/issues/context_menu')"))
                 # Links to versions anchors
                 assert_tag 'a', :attributes => {:href => '#2.0'},
                                 :ancestor => {:tag => 'div', :attributes => {:id => 'sidebar'}}
                 # Links to completed versions in the sidebar
                 assert_tag 'a', :attributes => {:href => '/versions/1'},
                                 :ancestor => {:tag => 'div', :attributes => {:id => 'sidebar'}}
               end
               def test_index_with_completed_versions
                 get :index, :project_id => 1, :completed => 1
                 assert_response :success
                 assert_template 'index'
                 assert_not_nil assigns(:versions)
                 # Version with no date set appears
                 assert assigns(:versions).include?(Version.find(3))
                 # Completed version appears
                 assert assigns(:versions).include?(Version.find(1))
               end
               def test_index_with_tracker_ids
                 get :index, :project_id => 1, :tracker_ids => [1, 3]
                 assert_response :success
                 assert_template 'index'
                 assert_not_nil assigns(:issues_by_version)
                 assert_nil assigns(:issues_by_version).values.flatten.detect {|issue| issue.tracker_id == 2}
               end
               def test_index_showing_subprojects_versions
                 @subproject_version = Version.create!(:project => Project.find(3), :name => "Subproject version")
                 get :index, :project_id => 1, :with_subprojects => 1
                 assert_response :success
                 assert_template 'index'
                 assert_not_nil assigns(:versions)
                 assert assigns(:versions).include?(Version.find(4)), "Shared version not found"
                 assert assigns(:versions).include?(@subproject_version), "Subproject version not found"
               end
               def test_index_should_prepend_shared_versions
                 get :index, :project_id => 1
                 assert_response :success
                 assert_select '#sidebar' do
                   assert_select 'a[href=?]', '#2.0', :text => '2.0'
                   assert_select 'a[href=?]', '#subproject1-2.0', :text => 'eCookbook Subproject 1 - 2.0'
                 end
                 assert_select '#content' do
                   assert_select 'a[name=?]', '2.0', :text => '2.0'
                   assert_select 'a[name=?]', 'subproject1-2.0', :text => 'eCookbook Subproject 1 - 2.0'
                 end
               end
               def test_show
                 get :show, :id => 2
                 assert_response :success
                 assert_template 'show'
                 assert_not_nil assigns(:version)
                 assert_tag :tag => 'h2', :content => /1.0/
               end
+              def test_show_should_display_nil_counts
+                with_settings :default_language => 'en' do
+                  get :show, :id => 2, :status_by => 'category'
+                  assert_response :success
+                  assert_select 'div#status_by' do
+                    assert_select 'select[name=status_by]' do
+                      assert_select 'option[value=category][selected=selected]'
+                    end
+                    assert_select 'a', :text => 'none'
+                  end
+                end
+              end
               def test_new
                 @request.session[:user_id] = 2
                 get :new, :project_id => '1'
                 assert_response :success
                 assert_template 'new'
               end
               def test_new_from_issue_form
                 @request.session[:user_id] = 2
                 xhr :get, :new, :project_id => '1'
                 assert_response :success
                 assert_template 'new'
                 assert_equal 'text/javascript', response.content_type
               end
               def test_create
                 @request.session[:user_id] = 2 # manager
                 assert_difference 'Version.count' do
                   post :create, :project_id => '1', :version => {:name => 'test_add_version'}
                 end
                 assert_redirected_to '/projects/ecookbook/settings/versions'
                 version = Version.find_by_name('test_add_version')
                 assert_not_nil version
                 assert_equal 1, version.project_id
               end
               def test_create_from_issue_form
                 @request.session[:user_id] = 2
                 assert_difference 'Version.count' do
                   xhr :post, :create, :project_id => '1', :version => {:name => 'test_add_version_from_issue_form'}
                 end
                 version = Version.find_by_name('test_add_version_from_issue_form')
                 assert_not_nil version
                 assert_equal 1, version.project_id
                 assert_response :success
                 assert_template 'create'
                 assert_equal 'text/javascript', response.content_type
                 assert_include 'test_add_version_from_issue_form', response.body
               end
               def test_create_from_issue_form_with_failure
                 @request.session[:user_id] = 2
                 assert_no_difference 'Version.count' do
                   xhr :post, :create, :project_id => '1', :version => {:name => ''}
                 end
                 assert_response :success
                 assert_template 'new'
                 assert_equal 'text/javascript', response.content_type
               end
               def test_get_edit
                 @request.session[:user_id] = 2
                 get :edit, :id => 2
                 assert_response :success
                 assert_template 'edit'
               end
               def test_close_completed
                 Version.update_all("status = 'open'")
                 @request.session[:user_id] = 2
                 put :close_completed, :project_id => 'ecookbook'
                 assert_redirected_to :controller => 'projects', :action => 'settings', :tab => 'versions', :id => 'ecookbook'
                 assert_not_nil Version.find_by_status('closed')
               end
               def test_post_update
                 @request.session[:user_id] = 2
                 put :update, :id => 2,
                             :version => { :name => 'New version name',
                                           :effective_date => Date.today.strftime("%Y-%m-%d")}
                 assert_redirected_to :controller => 'projects', :action => 'settings', :tab => 'versions', :id => 'ecookbook'
                 version = Version.find(2)
                 assert_equal 'New version name', version.name
                 assert_equal Date.today, version.effective_date
               end
               def test_post_update_with_validation_failure
                 @request.session[:user_id] = 2
                 put :update, :id => 2,
                              :version => { :name => '',
                                            :effective_date => Date.today.strftime("%Y-%m-%d")}
                 assert_response :success
                 assert_template 'edit'
               end
               def test_destroy
                 @request.session[:user_id] = 2
                 assert_difference 'Version.count', -1 do
                   delete :destroy, :id => 3
                 end
                 assert_redirected_to :controller => 'projects', :action => 'settings', :tab => 'versions', :id => 'ecookbook'
                 assert_nil Version.find_by_id(3)
               end
               def test_destroy_version_in_use_should_fail
                 @request.session[:user_id] = 2
                 assert_no_difference 'Version.count' do
                   delete :destroy, :id => 2
                 end
                 assert_redirected_to :controller => 'projects', :action => 'settings', :tab => 'versions', :id => 'ecookbook'
                 assert flash[:error].match(/Unable to delete version/)
                 assert Version.find_by_id(2)
               end
               def test_issue_status_by
                 xhr :get, :status_by, :id => 2
                 assert_response :success
                 assert_template 'status_by'
                 assert_template '_issue_counts'
               end
               def test_issue_status_by_status
                 xhr :get, :status_by, :id => 2, :status_by => 'status'
                 assert_response :success
                 assert_template 'status_by'
                 assert_template '_issue_counts'
                 assert_include 'Assigned', response.body
                 assert_include 'Closed', response.body
               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