From 62bed8b93f1bdfdc8ee52db00133bfe0880d4842 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sat, 30 May 2015 08:46:41 +0000 Subject: Validates that activity belongs to project activities (#19656). git-svn-id: http://svn.redmine.org/redmine/trunk@14288 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/models/time_entry.rb | 1 + 1 file changed, 1 insertion(+) (limited to 'app') diff --git a/app/models/time_entry.rb b/app/models/time_entry.rb index c5a917d96..062e9c80b 100644 --- a/app/models/time_entry.rb +++ b/app/models/time_entry.rb @@ -116,6 +116,7 @@ class TimeEntry < ActiveRecord::Base 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) || @invalid_issue_id + errors.add :activity_id, :inclusion if activity_id_changed? && project && !project.activities.include?(activity) end def hours=(h) -- cgit v1.2.3