diff options
| -rw-r--r-- | app/controllers/issues_controller.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index 1c3d8cec2..9829b124e 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -505,11 +505,11 @@ class IssuesController < ApplicationController if params[:time_entry] @time_entry.safe_attributes = params[:time_entry] end - @issue.init_journal(User.current) - issue_attributes = params[:issue] - issue_attributes[:assigned_to_id] = User.current.id if issue_attributes && issue_attributes[:assigned_to_id] == 'me' + if issue_attributes && issue_attributes[:assigned_to_id] == 'me' + issue_attributes[:assigned_to_id] = User.current.id + end if issue_attributes && params[:conflict_resolution] case params[:conflict_resolution] when 'overwrite' |