jro_apps/redmine Commit - r9531:59cbc68dde9c

Code cleanup....

Jean-Philippe Lang -

r9531:59cbc68dde9c

parent child

Context file:

r9531:59cbc68dde9c

Collapse all files

app/controllers/projects_controller.rb +4 -4

               def new
                 @issue_custom_fields = IssueCustomField.find(:all, :order => "#{CustomField.table_name}.position")
-                @trackers = Tracker.all
+                @trackers = Tracker.sorted.all
                 @project = Project.new
                 @project.safe_attributes = params[:project]
               end
               def create
                 @issue_custom_fields = IssueCustomField.find(:all, :order => "#{CustomField.table_name}.position")
-                @trackers = Tracker.all
+                @trackers = Tracker.sorted.all
                 @project = Project.new
                 @project.safe_attributes = params[:project]
               def copy
                 @issue_custom_fields = IssueCustomField.find(:all, :order => "#{CustomField.table_name}.position")
-                @trackers = Tracker.all
+                @trackers = Tracker.sorted.all
                 @root_projects = Project.find(:all,
                                               :conditions => "parent_id IS NULL AND status = #{Project::STATUS_ACTIVE}",
                                               :order => 'name')
                 @issue_custom_fields = IssueCustomField.find(:all, :order => "#{CustomField.table_name}.position")
                 @issue_category ||= IssueCategory.new
                 @member ||= @project.members.new
-                @trackers = Tracker.all
+                @trackers = Tracker.sorted.all
                 @wiki ||= @project.wiki
               end

app/controllers/trackers_controller.rb +1 -1

                     render :action => "index", :layout => false if request.xhr?
                   }
                   format.api {
-                    @trackers = Tracker.all
+                    @trackers = Tracker.sorted.all
                   }
                 end
               end

app/models/project.rb +1 -1

                   self.enabled_module_names = Setting.default_projects_modules
                 end
                 if !initialized.key?('trackers') && !initialized.key?('tracker_ids')
-                  self.trackers = Tracker.all
+                  self.trackers = Tracker.sorted.all
                 end
               end

app/models/tracker.rb +3 -6

               validates_uniqueness_of :name
               validates_length_of :name, :maximum => 30
-              scope :named, lambda {|arg| { :conditions => ["LOWER(#{table_name}.name) = LOWER(?)", arg.to_s.strip]}}
+              scope :sorted, order("#{table_name}.position ASC")
+              scope :named, lambda {|arg| where("LOWER(#{table_name}.name) = LOWER(?)", arg.to_s.strip)}
               def to_s; name end
                 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
             private
               def check_integrity
-                raise "Can't delete tracker" if Issue.find(:first, :conditions => ["tracker_id=?", self.id])
+                raise Exception.new("Can't delete tracker") if Issue.where(:tracker_id => self.id).any?
               end
             end

app/models/workflow.rb +1 -1

                 target_trackers = [target_trackers].flatten.compact
                 target_roles = [target_roles].flatten.compact
-                target_trackers = Tracker.all if target_trackers.empty?
+                target_trackers = Tracker.sorted.all if target_trackers.empty?
                 target_roles = Role.all if target_roles.empty?
                 target_trackers.each do |target_tracker|

app/views/custom_fields/_form.html.erb +1 -1

             when "IssueCustomField" %>
                 <fieldset><legend><%=l(:label_tracker_plural)%></legend>
-                <% Tracker.all.each do |tracker| %>
+                <% Tracker.sorted.all.each do |tracker| %>
                   <%= check_box_tag "custom_field[tracker_ids][]",
                                     tracker.id,
                                     (@custom_field.trackers.include? tracker),

test/unit/tracker_test.rb +30 -1

@@ -18,7 +18,15
18	require File.expand_path('../../test_helper', __FILE__)	18	require File.expand_path('../../test_helper', __FILE__)
19		19
20	class TrackerTest < ActiveSupport::TestCase	20	class TrackerTest < ActiveSupport::TestCase
21	fixtures :trackers, :workflows, :issue_statuses, :roles	21	fixtures :trackers, :workflows, :issue_statuses, :roles, :issues
		22
		23	def test_sorted_scope
		24	assert_equal Tracker.all.sort, Tracker.sorted.all
		25	end
		26
		27	def test_named_scope
		28	assert_equal Tracker.find_by_name('Feature'), Tracker.named('feature').first
		29	end
22		30
23	def test_copy_workflows	31	def test_copy_workflows
24	source = Tracker.find(1)	32	source = Tracker.find(1)
@@ -57,4 +65,25 class TrackerTest < ActiveSupport::TestCase
57		65
58	assert_equal [b, a], [a, b].sort	66	assert_equal [b, a], [a, b].sort
59	end	67	end
		68
		69	def test_destroying_a_tracker_without_issues_should_not_raise_an_error
		70	tracker = Tracker.find(1)
		71	Issue.delete_all :tracker_id => tracker.id
		72
		73	assert_difference 'Tracker.count', -1 do
		74	assert_nothing_raised do
		75	tracker.destroy
		76	end
		77	end
		78	end
		79
		80	def test_destroying_a_tracker_with_issues_should_raise_an_error
		81	tracker = Tracker.find(1)
		82
		83	assert_no_difference 'Tracker.count' do
		84	assert_raise Exception do
		85	tracker.destroy
		86	end
		87	end
		88	end
60	end	89	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