|
|
@@ -118,12 +118,12 @@ class TimelogController < ApplicationController |
|
|
|
|
|
|
|
def new |
|
|
|
@time_entry ||= TimeEntry.new(:project => @project, :issue => @issue, :user => User.current, :spent_on => User.current.today) |
|
|
|
@time_entry.attributes = params[:time_entry] |
|
|
|
@time_entry.safe_attributes = params[:time_entry] |
|
|
|
end |
|
|
|
|
|
|
|
def create |
|
|
|
@time_entry ||= TimeEntry.new(:project => @project, :issue => @issue, :user => User.current, :spent_on => User.current.today) |
|
|
|
@time_entry.attributes = params[:time_entry] |
|
|
|
@time_entry.safe_attributes = params[:time_entry] |
|
|
|
|
|
|
|
call_hook(:controller_timelog_edit_before_save, { :params => params, :time_entry => @time_entry }) |
|
|
|
|
|
|
@@ -152,11 +152,11 @@ class TimelogController < ApplicationController |
|
|
|
end |
|
|
|
|
|
|
|
def edit |
|
|
|
@time_entry.attributes = params[:time_entry] |
|
|
|
@time_entry.safe_attributes = params[:time_entry] |
|
|
|
end |
|
|
|
|
|
|
|
def update |
|
|
|
@time_entry.attributes = params[:time_entry] |
|
|
|
@time_entry.safe_attributes = params[:time_entry] |
|
|
|
|
|
|
|
call_hook(:controller_timelog_edit_before_save, { :params => params, :time_entry => @time_entry }) |
|
|
|
|
|
|
@@ -187,7 +187,7 @@ class TimelogController < ApplicationController |
|
|
|
unsaved_time_entry_ids = [] |
|
|
|
@time_entries.each do |time_entry| |
|
|
|
time_entry.reload |
|
|
|
time_entry.attributes = attributes |
|
|
|
time_entry.safe_attributes = attributes |
|
|
|
call_hook(:controller_time_entries_bulk_edit_before_save, { :params => params, :time_entry => time_entry }) |
|
|
|
unless time_entry.save |
|
|
|
# Keep unsaved time_entry ids to display them in flash error |