diff --git a/app/models/mailer.rb b/app/models/mailer.rb index 1e3995724..63fbe6ce0 100644 --- a/app/models/mailer.rb +++ b/app/models/mailer.rb @@ -15,8 +15,6 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -require 'ar_condition' - class Mailer < ActionMailer::Base layout 'mailer' helper :application diff --git a/lib/ar_condition.rb b/lib/ar_condition.rb deleted file mode 100644 index 600d2d061..000000000 --- a/lib/ar_condition.rb +++ /dev/null @@ -1,41 +0,0 @@ -# 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 -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - -class ARCondition - attr_reader :conditions - - def initialize(condition=nil) - @conditions = ['1=1'] - add(condition) if condition - end - - def add(condition) - if condition.is_a?(Array) - @conditions.first << " AND (#{condition.first})" - @conditions += condition[1..-1] - elsif condition.is_a?(String) - @conditions.first << " AND (#{condition})" - else - raise "Unsupported #{condition.class} condition: #{condition}" - end - self - end - - def <<(condition) - add(condition) - end -end