Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Improved order of callback for destroy (delete references first).

Browse source
This commit is contained in:
Martin Edenhofer 2014-08-26 16:24:44 +02:00
parent 62b07e2f35
commit 5f401a7b04
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/models/application_model.rb
View file

@ -21,7 +21,7 @@ class ApplicationModel < ActiveRecord::Base
after_create :activity_stream_create after_create :activity_stream_create
after_update :activity_stream_update after_update :activity_stream_update
after_destroy :activity_stream_destroy before_destroy :activity_stream_destroy
after_create :history_create after_create :history_create
after_update :history_update after_update :history_update
@ -31,7 +31,7 @@ class ApplicationModel < ActiveRecord::Base
after_update :search_index_update after_update :search_index_update
after_destroy :search_index_destroy after_destroy :search_index_destroy
after_destroy :recent_view_destroy before_destroy :recent_view_destroy
# create instance accessor # create instance accessor
class << self class << self

5
app/models/recent_view.rb
View file

@ -22,9 +22,10 @@ class RecentView < ApplicationModel
end end
def self.log_destroy( requested_object, requested_object_id ) def self.log_destroy( requested_object, requested_object_id )
return if requested_object == 'RecentView'
RecentView.where( :recent_view_object_id => ObjectLookup.by_name( requested_object ) ). RecentView.where( :recent_view_object_id => ObjectLookup.by_name( requested_object ) ).
where( :o_id => requested_object_id ). where( :o_id => requested_object_id ).
destroy_all destroy_all
end end
def self.user_log_destroy( user ) def self.user_log_destroy( user )