jro_apps/redmine Commit - r9696:7ed2c481d898

Reversed order of priorities on the issue summary page (#11205)....

Jean-Philippe Lang -

r9696:7ed2c481d898

parent child

Context file:

r9696:7ed2c481d898

Collapse all files

app/controllers/reports_controller.rb +2 -2

             # 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.
             class ReportsController < ApplicationController
               menu_item :issues
               before_filter :find_project, :authorize, :find_issue_statuses
               def issue_report
                 @trackers = @project.trackers
                 @versions = @project.shared_versions.sort
-                @priorities = IssuePriority.all
+                @priorities = IssuePriority.all.reverse
                 @categories = @project.issue_categories
                 @assignees = (Setting.issue_group_assignment? ? @project.principals : @project.users).sort
                 @authors = @project.users.sort
                 @subprojects = @project.descendants.visible
                 @issues_by_tracker = Issue.by_tracker(@project)
                 @issues_by_version = Issue.by_version(@project)
                 @issues_by_priority = Issue.by_priority(@project)
                 @issues_by_category = Issue.by_category(@project)
                 @issues_by_assigned_to = Issue.by_assigned_to(@project)
                 @issues_by_author = Issue.by_author(@project)
                 @issues_by_subproject = Issue.by_subproject(@project) || []
                 render :template => "reports/issue_report"
               end
               def issue_report_details
                 case params[:detail]
                 when "tracker"
                   @field = "tracker_id"
                   @rows = @project.trackers
                   @data = Issue.by_tracker(@project)
                   @report_title = l(:field_tracker)
                 when "version"
                   @field = "fixed_version_id"
                   @rows = @project.shared_versions.sort
                   @data = Issue.by_version(@project)
                   @report_title = l(:field_version)
                 when "priority"
                   @field = "priority_id"
-                  @rows = IssuePriority.all
+                  @rows = IssuePriority.all.reverse
                   @data = Issue.by_priority(@project)
                   @report_title = l(:field_priority)
                 when "category"
                   @field = "category_id"
                   @rows = @project.issue_categories
                   @data = Issue.by_category(@project)
                   @report_title = l(:field_category)
                 when "assigned_to"
                   @field = "assigned_to_id"
                   @rows = (Setting.issue_group_assignment? ? @project.principals : @project.users).sort
                   @data = Issue.by_assigned_to(@project)
                   @report_title = l(:field_assigned_to)
                 when "author"
                   @field = "author_id"
                   @rows = @project.users.sort
                   @data = Issue.by_author(@project)
                   @report_title = l(:field_author)
                 when "subproject"
                   @field = "project_id"
                   @rows = @project.descendants.visible
                   @data = Issue.by_subproject(@project) || []
                   @report_title = l(:field_subproject)
                 end
                 respond_to do |format|
                   if @field
                     format.html {}
                   else
                     format.html { redirect_to :action => 'issue_report', :id => @project }
                   end
                 end
               end
               private
               def find_issue_statuses
                 @statuses = IssueStatus.find(:all, :order => 'position')
               end
             end

test/functional/reports_controller_test.rb +8 -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__)
             class ReportsControllerTest < ActionController::TestCase
               fixtures :projects, :trackers, :issue_statuses, :issues,
                        :enumerations, :users, :issue_categories,
                        :projects_trackers,
                        :roles,
                        :member_roles,
                        :members,
                        :enabled_modules,
                        :workflows,
                        :versions
               def setup
               end
               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].each do |ivar|
+                 :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_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