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

app/helpers/versions_helper.rb +2 -1

                 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}

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

                 <% 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,

test/functional/versions_controller_test.rb +14 -1

             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
                 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'

General Comments 0

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

No TODOs yet

	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