Merged r6199 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@6200 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/models/enumeration.rb b/app/models/enumeration.rb
index 3b7a434a7a4600a3a0ad0d67d42f1c9927836e45..71afe8feee8e49b93d1f8cd9fe5ae679742babe5 100644 (file)
--- a/app/models/enumeration.rb
+++ b/app/models/enumeration.rb
@@ -32,6 +32,7 @@ class Enumeration < ActiveRecord::Base
 
   named_scope :shared, :conditions => { :project_id => nil }
   named_scope :active, :conditions => { :active => true }
+  named_scope :named, lambda {|arg| { :conditions => ["LOWER(#{table_name}.name) = LOWER(?)", arg.to_s.strip]}}
 
   def self.default
     # Creates a fake default scope so Enumeration.default will check

diff --git a/app/models/issue_category.rb b/app/models/issue_category.rb
index 51baeb4194f48901827dcd23a7e0f94e7d2dd563..96b8eeee12120d4c47e7baa646b80ac45398ac5c 100644 (file)
--- a/app/models/issue_category.rb
+++ b/app/models/issue_category.rb
@@ -1,5 +1,5 @@
-# redMine - project management software
-# Copyright (C) 2006  Jean-Philippe Lang
+# Redmine - project management software
+# Copyright (C) 2006-2011  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
@@ -24,6 +24,8 @@ class IssueCategory < ActiveRecord::Base
   validates_uniqueness_of :name, :scope => [:project_id]
   validates_length_of :name, :maximum => 30
   
+  named_scope :named, lambda {|arg| { :conditions => ["LOWER(#{table_name}.name) = LOWER(?)", arg.to_s.strip]}}
+  
   alias :destroy_without_reassign :destroy
   
   # Destroy the category

diff --git a/app/models/issue_status.rb b/app/models/issue_status.rb
index 5527e2c9a6621bedbf84320ef14291ba1010a279..f2db4b5705cc99141a263bef151e3e9de489ebe3 100644 (file)
--- a/app/models/issue_status.rb
+++ b/app/models/issue_status.rb
@@ -26,6 +26,8 @@ class IssueStatus < ActiveRecord::Base
   validates_uniqueness_of :name
   validates_length_of :name, :maximum => 30
   validates_inclusion_of :default_done_ratio, :in => 0..100, :allow_nil => true
+  
+  named_scope :named, lambda {|arg| { :conditions => ["LOWER(#{table_name}.name) = LOWER(?)", arg.to_s.strip]}}
 
   def after_save
     IssueStatus.update_all("is_default=#{connection.quoted_false}", ['id <> ?', id]) if self.is_default?

diff --git a/app/models/mail_handler.rb b/app/models/mail_handler.rb
index a312301d21c8d0b0f7842a1ed8e021be398f1b4b..dbbd4f5f364336e1b692e81c556303f6fdeef85e 100644 (file)
--- a/app/models/mail_handler.rb
+++ b/app/models/mail_handler.rb
@@ -265,12 +265,12 @@ class MailHandler < ActionMailer::Base
     assigned_to = nil if assigned_to && !issue.assignable_users.include?(assigned_to)
 
     attrs = {
-      'tracker_id' => (k = get_keyword(:tracker)) && issue.project.trackers.find_by_name(k).try(:id),
-      'status_id' =>  (k = get_keyword(:status)) && IssueStatus.find_by_name(k).try(:id),
-      'priority_id' => (k = get_keyword(:priority)) && IssuePriority.find_by_name(k).try(:id),
-      'category_id' => (k = get_keyword(:category)) && issue.project.issue_categories.find_by_name(k).try(:id),
+      'tracker_id' => (k = get_keyword(:tracker)) && issue.project.trackers.named(k).first.try(:id),
+      'status_id' =>  (k = get_keyword(:status)) && IssueStatus.named(k).first.try(:id),
+      'priority_id' => (k = get_keyword(:priority)) && IssuePriority.named(k).first.try(:id),
+      'category_id' => (k = get_keyword(:category)) && issue.project.issue_categories.named(k).first.try(:id),
       'assigned_to_id' => assigned_to.try(:id),
-      'fixed_version_id' => (k = get_keyword(:fixed_version, :override => true)) && issue.project.shared_versions.find_by_name(k).try(:id),
+      'fixed_version_id' => (k = get_keyword(:fixed_version, :override => true)) && issue.project.shared_versions.named(k).first.try(:id),
       'start_date' => get_keyword(:start_date, :override => true, :format => '\d{4}-\d{2}-\d{2}'),
       'due_date' => get_keyword(:due_date, :override => true, :format => '\d{4}-\d{2}-\d{2}'),
       'estimated_hours' => get_keyword(:estimated_hours, :override => true),

diff --git a/app/models/tracker.rb b/app/models/tracker.rb
index 93fdd4035cd16d66c08f7287d6d0c1b60bc83931..7bf5732ba6fe5b06c573ecc18b1804e6f2ec71ae 100644 (file)
--- a/app/models/tracker.rb
+++ b/app/models/tracker.rb
@@ -32,6 +32,8 @@ class Tracker < ActiveRecord::Base
   validates_uniqueness_of :name
   validates_length_of :name, :maximum => 30
 
+  named_scope :named, lambda {|arg| { :conditions => ["LOWER(#{table_name}.name) = LOWER(?)", arg.to_s.strip]}}
+  
   def to_s; name end
   
   def <=>(tracker)

diff --git a/app/models/version.rb b/app/models/version.rb
index 8b01816a76c33015623d6ac91b1b6923662ba68b..710074a869943560789fa169696002dbae470cc1 100644 (file)
--- a/app/models/version.rb
+++ b/app/models/version.rb
@@ -33,6 +33,7 @@ class Version < ActiveRecord::Base
   validates_inclusion_of :status, :in => VERSION_STATUSES
   validates_inclusion_of :sharing, :in => VERSION_SHARINGS
 
+  named_scope :named, lambda {|arg| { :conditions => ["LOWER(#{table_name}.name) = LOWER(?)", arg.to_s.strip]}}
   named_scope :open, :conditions => {:status => 'open'}
   named_scope :visible, lambda {|*args| { :include => :project,
                                           :conditions => Project.allowed_to_condition(args.first || User.current, :view_issues) } }

diff --git a/test/fixtures/mail_handler/ticket_with_attributes.eml b/test/fixtures/mail_handler/ticket_with_attributes.eml
index 1185234961c726aa0cae2a82762cfaca12df08de..49d55c4822b116eebc9472a36a068bd2cb0739a9 100644 (file)
--- a/test/fixtures/mail_handler/ticket_with_attributes.eml
+++ b/test/fixtures/mail_handler/ticket_with_attributes.eml
@@ -38,6 +38,6 @@ massa. Sed sodales, ante fermentum ultricies sollicitudin, massa leo
 pulvinar dui, a gravida orci mi eget odio. Nunc a lacus.
 
 Project: onlinestore
-Tracker: Feature request
-category: Stock management
-priority: Urgent
+Tracker: Feature Request
+category: stock management
+priority: URGENT

diff --git a/test/unit/mail_handler_test.rb b/test/unit/mail_handler_test.rb
index cf7f350cd530d729da6a79b4fb3f7c87d3386710..2ead0393503ed5f44a37548f74354c26a12b6037 100644 (file)
--- a/test/unit/mail_handler_test.rb
+++ b/test/unit/mail_handler_test.rb
@@ -63,7 +63,7 @@ class MailHandlerTest < ActiveSupport::TestCase
     assert_equal '2010-01-01', issue.start_date.to_s
     assert_equal '2010-12-31', issue.due_date.to_s
     assert_equal User.find_by_login('jsmith'), issue.assigned_to
-    assert_equal Version.find_by_name('alpha'), issue.fixed_version
+    assert_equal Version.find_by_name('Alpha'), issue.fixed_version
     assert_equal 2.5, issue.estimated_hours
     assert_equal 30, issue.done_ratio
     assert_equal [issue.id, 1, 2], [issue.root_id, issue.lft, issue.rgt]