jro_apps/redmine Commit - r11242:458800c1d575

Time entry with 2 digits year should not validate (#3107)....

Jean-Philippe Lang -

r11242:458800c1d575

parent child

Context file:

r11242:458800c1d575

Collapse all files

app/models/time_entry.rb +1 0

             # Redmine - project management software
             # Copyright (C) 2006-2013  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 TimeEntry < ActiveRecord::Base
               include Redmine::SafeAttributes
               # could have used polymorphic association
               # project association here allows easy loading of time entries at project level with one database trip
               belongs_to :project
               belongs_to :issue
               belongs_to :user
               belongs_to :activity, :class_name => 'TimeEntryActivity', :foreign_key => 'activity_id'
               attr_protected :project_id, :user_id, :tyear, :tmonth, :tweek
               acts_as_customizable
               acts_as_event :title => Proc.new {|o| "#{l_hours(o.hours)} (#{(o.issue || o.project).event_title})"},
                             :url => Proc.new {|o| {:controller => 'timelog', :action => 'index', :project_id => o.project, :issue_id => o.issue}},
                             :author => :user,
                             :group => :issue,
                             :description => :comments
               acts_as_activity_provider :timestamp => "#{table_name}.created_on",
                                         :author_key => :user_id,
                                         :find_options => {:include => :project}
               validates_presence_of :user_id, :activity_id, :project_id, :hours, :spent_on
               validates_numericality_of :hours, :allow_nil => true, :message => :invalid
               validates_length_of :comments, :maximum => 255, :allow_nil => true
+              validates :spent_on, :date => true
               before_validation :set_project_if_nil
               validate :validate_time_entry
               scope :visible, lambda {|*args|
                 includes(:project).where(Project.allowed_to_condition(args.shift || User.current, :view_time_entries, *args))
               }
               scope :on_issue, lambda {|issue|
                 includes(:issue).where("#{Issue.table_name}.root_id = #{issue.root_id} AND #{Issue.table_name}.lft >= #{issue.lft} AND #{Issue.table_name}.rgt <= #{issue.rgt}")
               }
               scope :on_project, lambda {|project, include_subprojects|
                 includes(:project).where(project.project_condition(include_subprojects))
               }
               scope :spent_between, lambda {|from, to|
                 if from && to
                  where("#{TimeEntry.table_name}.spent_on BETWEEN ? AND ?", from, to)
                 elsif from
                  where("#{TimeEntry.table_name}.spent_on >= ?", from)
                 elsif to
                  where("#{TimeEntry.table_name}.spent_on <= ?", to)
                 else
                  where(nil)
                 end
               }
               safe_attributes 'hours', 'comments', 'issue_id', 'activity_id', 'spent_on', 'custom_field_values', 'custom_fields'
               def initialize(attributes=nil, *args)
                 super
                 if new_record? && self.activity.nil?
                   if default_activity = TimeEntryActivity.default
                     self.activity_id = default_activity.id
                   end
                   self.hours = nil if hours == 0
                 end
               end
               def set_project_if_nil
                 self.project = issue.project if issue && project.nil?
               end
               def validate_time_entry
                 errors.add :hours, :invalid if hours && (hours < 0 || hours >= 1000)
                 errors.add :project_id, :invalid if project.nil?
                 errors.add :issue_id, :invalid if (issue_id && !issue) || (issue && project!=issue.project)
               end
               def hours=(h)
                 write_attribute :hours, (h.is_a?(String) ? (h.to_hours || h) : h)
               end
               def hours
                 h = read_attribute(:hours)
                 if h.is_a?(Float)
                   h.round(2)
                 else
                   h
                 end
               end
               # tyear, tmonth, tweek assigned where setting spent_on attributes
               # these attributes make time aggregations easier
               def spent_on=(date)
                 super
                 if spent_on.is_a?(Time)
                   self.spent_on = spent_on.to_date
                 end
                 self.tyear = spent_on ? spent_on.year : nil
                 self.tmonth = spent_on ? spent_on.month : nil
                 self.tweek = spent_on ? Date.civil(spent_on.year, spent_on.month, spent_on.day).cweek : nil
               end
               # Returns true if the time entry can be edited by usr, otherwise false
               def editable_by?(usr)
                 (usr == user && usr.allowed_to?(:edit_own_time_entries, project)) || usr.allowed_to?(:edit_time_entries, project)
               end
             end

test/unit/time_entry_test.rb +7 0

             # Redmine - project management software
             # Copyright (C) 2006-2013  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.
             require File.expand_path('../../test_helper', __FILE__)
             class TimeEntryTest < ActiveSupport::TestCase
               fixtures :issues, :projects, :users, :time_entries,
                        :members, :roles, :member_roles,
                        :trackers, :issue_statuses,
                        :projects_trackers,
                        :journals, :journal_details,
                        :issue_categories, :enumerations,
                        :groups_users,
                        :enabled_modules
               def test_hours_format
                 assertions = { "2"      => 2.0,
                                "21.1"   => 21.1,
                                "2,1"    => 2.1,
                                "1,5h"   => 1.5,
                                "7:12"   => 7.2,
                                "10h"    => 10.0,
                                "10 h"   => 10.0,
                                "45m"    => 0.75,
                                "45 m"   => 0.75,
                                "3h15"   => 3.25,
                                "3h 15"  => 3.25,
                                "3 h 15"   => 3.25,
                                "3 h 15m"  => 3.25,
                                "3 h 15 m" => 3.25,
                                "3 hours"  => 3.0,
                                "12min"    => 0.2,
                                "12 Min"    => 0.2,
                               }
                 assertions.each do |k, v|
                   t = TimeEntry.new(:hours => k)
                   assert_equal v, t.hours, "Converting #{k} failed:"
                 end
               end
               def test_hours_should_default_to_nil
                 assert_nil TimeEntry.new.hours
               end
               def test_spent_on_with_blank
                 c = TimeEntry.new
                 c.spent_on = ''
                 assert_nil c.spent_on
               end
               def test_spent_on_with_nil
                 c = TimeEntry.new
                 c.spent_on = nil
                 assert_nil c.spent_on
               end
               def test_spent_on_with_string
                 c = TimeEntry.new
                 c.spent_on = "2011-01-14"
                 assert_equal Date.parse("2011-01-14"), c.spent_on
               end
               def test_spent_on_with_invalid_string
                 c = TimeEntry.new
                 c.spent_on = "foo"
                 assert_nil c.spent_on
               end
               def test_spent_on_with_date
                 c = TimeEntry.new
                 c.spent_on = Date.today
                 assert_equal Date.today, c.spent_on
               end
               def test_spent_on_with_time
                 c = TimeEntry.new
                 c.spent_on = Time.now
                 assert_equal Date.today, c.spent_on
               end
               def test_validate_time_entry
                 anon     = User.anonymous
                 project  = Project.find(1)
                 issue    = Issue.new(:project_id => 1, :tracker_id => 1, :author_id => anon.id, :status_id => 1,
                                      :priority => IssuePriority.all.first, :subject => 'test_create',
                                      :description => 'IssueTest#test_create', :estimated_hours => '1:30')
                 assert issue.save
                 activity = TimeEntryActivity.find_by_name('Design')
                 te = TimeEntry.create(:spent_on => '2010-01-01',
                                       :hours    => 100000,
                                       :issue    => issue,
                                       :project  => project,
                                       :user     => anon,
                                       :activity => activity)
                 assert_equal 1, te.errors.count
               end
+              def test_spent_on_with_2_digits_year_should_not_be_valid
+                entry = TimeEntry.new(:project => Project.find(1), :user => User.find(1), :activity => TimeEntryActivity.first, :hours => 1)
+                entry.spent_on = "09-02-04"
+                assert !entry.valid?
+                assert_include I18n.translate('activerecord.errors.messages.not_a_date'), entry.errors[:spent_on]
+              end
               def test_set_project_if_nil
                 anon     = User.anonymous
                 project  = Project.find(1)
                 issue    = Issue.new(:project_id => 1, :tracker_id => 1, :author_id => anon.id, :status_id => 1,
                                      :priority => IssuePriority.all.first, :subject => 'test_create',
                                      :description => 'IssueTest#test_create', :estimated_hours => '1:30')
                 assert issue.save
                 activity = TimeEntryActivity.find_by_name('Design')
                 te = TimeEntry.create(:spent_on => '2010-01-01',
                                       :hours    => 10,
                                       :issue    => issue,
                                       :user     => anon,
                                       :activity => activity)
                 assert_equal project.id, te.project.id
               end
             end

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