jro_apps/redmine Commit - r6080:3e9ad22fade0

Merged r6199 from trunk....

Jean-Philippe Lang -

r6080:3e9ad22fade0

parent child

Context file:

r6080:3e9ad22fade0

Collapse all files

app/models/enumeration.rb +1 0

               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

app/models/issue_category.rb +4 -2

-            # redMine - project management software
+            # Redmine - project management software
-            # Copyright (C) 2006  Jean-Philippe Lang
+            # 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
               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

app/models/issue_status.rb +2 0

               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?

app/models/mail_handler.rb +5 -5

                 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),
+                  'tracker_id' => (k = get_keyword(:tracker)) && issue.project.trackers.named(k).first.try(:id),
-                  'status_id' =>  (k = get_keyword(:status)) && IssueStatus.find_by_name(k).try(:id),
+                  'status_id' =>  (k = get_keyword(:status)) && IssueStatus.named(k).first.try(:id),
-                  'priority_id' => (k = get_keyword(:priority)) && IssuePriority.find_by_name(k).try(:id),
+                  'priority_id' => (k = get_keyword(:priority)) && IssuePriority.named(k).first.try(:id),
-                  'category_id' => (k = get_keyword(:category)) && issue.project.issue_categories.find_by_name(k).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),

app/models/tracker.rb +2 0

               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)

app/models/version.rb +1 0

               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) } }

test/fixtures/mail_handler/ticket_with_attributes.eml +3 -3

             pulvinar dui, a gravida orci mi eget odio. Nunc a lacus.
             Project: onlinestore
-            Tracker: Feature request
+            Tracker: Feature Request
-            category: Stock management
+            category: stock management
-            priority: Urgent
+            priority: URGENT

test/unit/mail_handler_test.rb +1 -1

                 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]

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