jro_apps/redmine Commit - r9461:18852b765a8a

Trackers should be sorted by position not by name....

Jean-Philippe Lang -

r9461:18852b765a8a

parent child

Context file:

r9461:18852b765a8a

Collapse all files

app/models/tracker.rb +1 -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.
             class Tracker < ActiveRecord::Base
               before_destroy :check_integrity
               has_many :issues
               has_many :workflows, :dependent => :delete_all do
                 def copy(source_tracker)
                   Workflow.copy(source_tracker, nil, proxy_association.owner, nil)
                 end
               end
               has_and_belongs_to_many :projects
               has_and_belongs_to_many :custom_fields, :class_name => 'IssueCustomField', :join_table => "#{table_name_prefix}custom_fields_trackers#{table_name_suffix}", :association_foreign_key => 'custom_field_id'
               acts_as_list
               validates_presence_of :name
               validates_uniqueness_of :name
               validates_length_of :name, :maximum => 30
               scope :named, lambda {|arg| { :conditions => ["LOWER(#{table_name}.name) = LOWER(?)", arg.to_s.strip]}}
               def to_s; name end
               def <=>(tracker)
-                name <=> tracker.name
+                position <=> tracker.position
               end
               def self.all
                 find(:all, :order => 'position')
               end
               # Returns an array of IssueStatus that are used
               # in the tracker's workflows
               def issue_statuses
                 if @issue_statuses
                   return @issue_statuses
                 elsif new_record?
                   return []
                 end
                 ids = Workflow.
                         connection.select_rows("SELECT DISTINCT old_status_id, new_status_id FROM #{Workflow.table_name} WHERE tracker_id = #{id}").
                         flatten.
                         uniq
                 @issue_statuses = IssueStatus.find_all_by_id(ids).sort
               end
             private
               def check_integrity
                 raise "Can't delete tracker" if Issue.find(:first, :conditions => ["tracker_id=?", self.id])
               end
             end

test/unit/tracker_test.rb +7 0

             # Redmine - project management software
             # Copyright (C) 2006-2008  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 TrackerTest < ActiveSupport::TestCase
               fixtures :trackers, :workflows, :issue_statuses, :roles
               def test_copy_workflows
                 source = Tracker.find(1)
                 assert_equal 89, source.workflows.size
                 target = Tracker.new(:name => 'Target')
                 assert target.save
                 target.workflows.copy(source)
                 target.reload
                 assert_equal 89, target.workflows.size
               end
               def test_issue_statuses
                 tracker = Tracker.find(1)
                 Workflow.delete_all
                 Workflow.create!(:role_id => 1, :tracker_id => 1, :old_status_id => 2, :new_status_id => 3)
                 Workflow.create!(:role_id => 2, :tracker_id => 1, :old_status_id => 3, :new_status_id => 5)
                 assert_kind_of Array, tracker.issue_statuses
                 assert_kind_of IssueStatus, tracker.issue_statuses.first
                 assert_equal [2, 3, 5], Tracker.find(1).issue_statuses.collect(&:id)
               end
               def test_issue_statuses_empty
                 Workflow.delete_all("tracker_id = 1")
                 assert_equal [], Tracker.find(1).issue_statuses
               end
               def test_issue_statuses_should_be_empty_for_new_record
                 assert_equal [], Tracker.new.issue_statuses
               end
+              def test_sort_should_sort_by_position
+                a = Tracker.new(:name => 'Tracker A', :position => 2)
+                b = Tracker.new(:name => 'Tracker B', :position => 1)
+                assert_equal [b, a], [a, b].sort
+              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