jro_apps/redmine Commit - r9798:6c1db9c3a8b2

Code cleanup....

Jean-Philippe Lang -

r9798:6c1db9c3a8b2

parent child

Context file:

r9798:6c1db9c3a8b2

Collapse all files

app/models/issue_status.rb +14 -14

               validates_length_of :name, :maximum => 30
               validates_inclusion_of :default_done_ratio, :in => 0..100, :allow_nil => true
-              scope :named, lambda {|arg| { :conditions => ["LOWER(#{table_name}.name) = LOWER(?)", arg.to_s.strip]}}
+              scope :named, lambda {|arg| where(["LOWER(#{table_name}.name) = LOWER(?)", arg.to_s.strip])}
               def update_default
-                IssueStatus.update_all("is_default=#{connection.quoted_false}", ['id <> ?', id]) if self.is_default?
+                IssueStatus.update_all({:is_default => false}, ['id <> ?', id]) if self.is_default?
               end
               # Returns the default status for new issues
               def self.default
-                find(:first, :conditions =>["is_default=?", true])
+                where(:is_default => true).first
               end
               # Update all the +Issues+ setting their done_ratio to the value of their +IssueStatus+
               def self.update_issue_done_ratios
                 if Issue.use_status_for_done_ratio?
-                  IssueStatus.find(:all, :conditions => ["default_done_ratio >= 0"]).each do |status|
+                  IssueStatus.where("default_done_ratio >= 0").all.each do |status|
-                    Issue.update_all(["done_ratio = ?", status.default_done_ratio],
+                    Issue.update_all({:done_ratio => status.default_done_ratio}, {:status_id => status.id})
-                                     ["status_id = ?", status.id])
                   end
                 end
                     w.tracker_id == tracker.id &&
                     ((!w.author && !w.assignee) || (author && w.author) || (assignee && w.assignee))
                   end
-                  transitions.collect{|w| w.new_status}.compact.sort
+                  transitions.map(&:new_status).compact.sort
                 else
                   []
                 end
                   conditions << " OR author = :true" if author
                   conditions << " OR assignee = :true" if assignee
-                  workflows.find(:all,
+                  workflows.
-                    :include => :new_status,
+                    includes(:new_status).
-                    :conditions => ["role_id IN (:role_ids) AND tracker_id = :tracker_id AND (#{conditions})",
+                    where(["role_id IN (:role_ids) AND tracker_id = :tracker_id AND (#{conditions})",
                       {:role_ids => roles.collect(&:id), :tracker_id => tracker.id, :true => true, :false => false}
+                      ]).all.
-                    ).collect{|w| w.new_status}.compact.sort
+                    map(&:new_status).compact.sort
                 else
                   []
                 end
               def to_s; name end
-            private
+              private
               def check_integrity
-                raise "Can't delete status" if Issue.find(:first, :conditions => ["status_id=?", self.id])
+                raise "Can't delete status" if Issue.where(:status_id => id).any?
               end
               # Deletes associated workflows

test/unit/issue_status_test.rb +6 0

@@ -111,4 +111,10 class IssueStatusTest < ActiveSupport::TestCase
111	assert_equal [50], issues.map {\|issue\| issue.read_attribute(:done_ratio)}.uniq	111	assert_equal [50], issues.map {\|issue\| issue.read_attribute(:done_ratio)}.uniq
112	end	112	end
113	end	113	end
		114
		115	def test_named_scope
		116	status = IssueStatus.named("resolved").first
		117	assert_not_nil status
		118	assert_equal "Resolved", status.name
		119	end
114	end	120	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