From 3e9ad22fade0c18af863034f7a1ff7f5ec74031b Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sat, 9 Jul 2011 10:51:57 +0000 Subject: [PATCH] Merged r6199 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@6200 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/models/enumeration.rb | 1 + app/models/issue_category.rb | 6 ++++-- app/models/issue_status.rb | 2 ++ app/models/mail_handler.rb | 10 +++++----- app/models/tracker.rb | 2 ++ app/models/version.rb | 1 + test/fixtures/mail_handler/ticket_with_attributes.eml | 6 +++--- test/unit/mail_handler_test.rb | 2 +- 8 files changed, 19 insertions(+), 11 deletions(-) diff --git a/app/models/enumeration.rb b/app/models/enumeration.rb index 3b7a434a7..71afe8fee 100644 --- 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 51baeb419..96b8eeee1 100644 --- 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 5527e2c9a..f2db4b570 100644 --- 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 a312301d2..dbbd4f5f3 100644 --- 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 93fdd4035..7bf5732ba 100644 --- 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 8b01816a7..710074a86 100644 --- 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 118523496..49d55c482 100644 --- 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 cf7f350cd..2ead03935 100644 --- 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] -- 2.39.5