diff options
-rw-r--r-- | app/controllers/repositories_controller.rb | 11 | ||||
-rw-r--r-- | lib/redmine/core_ext/date.rb | 5 | ||||
-rw-r--r-- | lib/redmine/core_ext/date/calculations.rb | 35 |
3 files changed, 41 insertions, 10 deletions
diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb index 98739a60c..ad7d2df36 100644 --- a/app/controllers/repositories_controller.rb +++ b/app/controllers/repositories_controller.rb @@ -1,5 +1,5 @@ # Redmine - project management software -# Copyright (C) 2006-2011 Jean-Philippe Lang +# Copyright (C) 2006-2012 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 @@ -366,12 +366,3 @@ class RepositoriesController < ApplicationController end end -class Date - def months_ago(date = Date.today) - (date.year - self.year)*12 + (date.month - self.month) - end - - def weeks_ago(date = Date.today) - (date.year - self.year)*52 + (date.cweek - self.cweek) - end -end diff --git a/lib/redmine/core_ext/date.rb b/lib/redmine/core_ext/date.rb new file mode 100644 index 000000000..d3a4ecd4e --- /dev/null +++ b/lib/redmine/core_ext/date.rb @@ -0,0 +1,5 @@ +require File.dirname(__FILE__) + '/date/calculations'
+
+class Date #:nodoc:
+ include Redmine::CoreExtensions::Date::Calculations
+end
diff --git a/lib/redmine/core_ext/date/calculations.rb b/lib/redmine/core_ext/date/calculations.rb new file mode 100644 index 000000000..4d71208e1 --- /dev/null +++ b/lib/redmine/core_ext/date/calculations.rb @@ -0,0 +1,35 @@ +# Redmine - project management software
+# Copyright (C) 2006-2012 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.
+
+module Redmine #:nodoc:
+ module CoreExtensions #:nodoc:
+ module Date #:nodoc:
+ # Custom date calculations
+ module Calculations
+ # Returns difference with specified date in months
+ def months_ago(date = self.class.today)
+ (date.year - self.year)*12 + (date.month - self.month)
+ end
+
+ # Returns difference with specified date in weeks
+ def weeks_ago(date = self.class.today)
+ (date.year - self.year)*52 + (date.cweek - self.cweek)
+ end
+ end
+ end
+ end
+end
|