bike/BikeShed-1
1
0
Fork 0
mirror of https://github.com/fspc/BikeShed-1.git synced 2025-02-28 16:53:23 -05:00
Code Issues Projects Releases Wiki Activity

Actually merge time_entry defaults

Browse Source
This commit is contained in:
Jason Denney 2014-04-20 22:56:26 -04:00
parent 2321197973
commit 82f38fe35c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/api/v1/time_entries_controller.rb
View File

@ -6,7 +6,7 @@ class Api::V1::TimeEntriesController < Api::V1::BaseController
loggable_type: "User", loggable_type: "User",
loggable_id: current_user.id, loggable_id: current_user.id,
log_action_type: "ActsAsLoggable::UserAction"} log_action_type: "ActsAsLoggable::UserAction"}
time_entry.merge(time_entry_defaults) time_entry.merge!(time_entry_defaults)
if time_entry[:bike_id] >= 0 if time_entry[:bike_id] >= 0
copy_defaults = { copy_defaults = {
@ -16,7 +16,7 @@ class Api::V1::TimeEntriesController < Api::V1::BaseController
copy_action_type: 'ActsAsLoggable::BikeAction', copy_action_type: 'ActsAsLoggable::BikeAction',
copy_action_id: 4 copy_action_id: 4
} }
time_entry.merge( copy_defaults ) time_entry.merge!( copy_defaults )
end end
@time_entry = ::ActsAsLoggable::Log.new(time_entry.except(:bike_id)) @time_entry = ::ActsAsLoggable::Log.new(time_entry.except(:bike_id))