diff options
author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-12-03 18:21:32 +0000 |
---|---|---|
committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-12-03 18:21:32 +0000 |
commit | 31c33f462d92aead29b8feb6445d8fe5626c4963 (patch) | |
tree | 0818c626e553e1cbb606e9c23a7342583288d448 /lib | |
parent | 013c6fe009e74892659c64c2936a2668a9663985 (diff) | |
download | redmine-31c33f462d92aead29b8feb6445d8fe5626c4963.tar.gz redmine-31c33f462d92aead29b8feb6445d8fe5626c4963.zip |
Replaces find(:first) calls.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10928 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib')
-rw-r--r-- | lib/redmine/default_data/loader.rb | 8 | ||||
-rw-r--r-- | lib/tasks/migrate_from_trac.rake | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/redmine/default_data/loader.rb b/lib/redmine/default_data/loader.rb index 70629e9d3..20ba6eabb 100644 --- a/lib/redmine/default_data/loader.rb +++ b/lib/redmine/default_data/loader.rb @@ -26,10 +26,10 @@ module Redmine # Returns true if no data is already loaded in the database # otherwise false def no_data? - !Role.find(:first, :conditions => {:builtin => 0}) && - !Tracker.find(:first) && - !IssueStatus.find(:first) && - !Enumeration.find(:first) + !Role.where(:builtin => 0).exists? && + !Tracker.exists? && + !IssueStatus.exists? && + !Enumeration.exists? end # Loads the default data diff --git a/lib/tasks/migrate_from_trac.rake b/lib/tasks/migrate_from_trac.rake index 1c7b7bb38..e419775d1 100644 --- a/lib/tasks/migrate_from_trac.rake +++ b/lib/tasks/migrate_from_trac.rake @@ -257,7 +257,7 @@ namespace :redmine do u.password = 'trac' u.admin = true if TracPermission.find_by_username_and_action(username, 'admin') # finally, a default user is used if the new user is not valid - u = User.find(:first) unless u.save + u = User.first unless u.save end # Make sure he is a member of the project if project_member && !u.member_of?(@target_project) @@ -450,7 +450,7 @@ namespace :redmine do puts # Trac 'resolution' field as a Redmine custom field - r = IssueCustomField.find(:first, :conditions => { :name => "Resolution" }) + r = IssueCustomField.where(:name => "Resolution").first r = IssueCustomField.new(:name => 'Resolution', :field_format => 'list', :is_filter => true) if r.nil? |