Browse Source

Set time entry author in controller (#32774).

git-svn-id: http://svn.redmine.org/redmine/trunk@19677 e93f8b46-1217-0410-a6f0-8f06a7374b81
tags/4.2.0
Jean-Philippe Lang 4 years ago
parent
commit
31c8e71d8e
2 changed files with 2 additions and 0 deletions
  1. 1
    0
      app/controllers/issues_controller.rb
  2. 1
    0
      app/models/time_entry.rb

+ 1
- 0
app/controllers/issues_controller.rb View File

@@ -614,6 +614,7 @@ class IssuesController < ApplicationController
time_entry = @time_entry || TimeEntry.new
time_entry.project = @issue.project
time_entry.issue = @issue
time_entry.author = User.current
time_entry.user = User.current
time_entry.spent_on = User.current.today
time_entry.safe_attributes = params[:time_entry]

+ 1
- 0
app/models/time_entry.rb View File

@@ -50,6 +50,7 @@ class TimeEntry < ActiveRecord::Base
validates_length_of :comments, :maximum => 1024, :allow_nil => true
validates :spent_on, :date => true
before_validation :set_project_if_nil
#TODO: remove this, author should be always explicitly set
before_validation :set_author_if_nil
validate :validate_time_entry


Loading…
Cancel
Save