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

Removed condition for types. Fetch all history entries.

Browse source
This commit is contained in:
Martin Edenhofer 2013-09-30 02:03:37 +02:00
parent d17116ddb9
commit a1aaa9a897
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/models/history.rb
View file

@ -118,18 +118,16 @@ return all history entries of an object
history_object = self.object_lookup( requested_object ) history_object = self.object_lookup( requested_object )
history = History.where( :history_object_id => history_object.id ). history = History.where( :history_object_id => history_object.id ).
where( :o_id => requested_object_id ). where( :o_id => requested_object_id ).
where( :history_type_id => History::Type.where( :name => ['created', 'updated', 'notification', 'email', 'added', 'removed'] ) ).
order('created_at ASC, id ASC') order('created_at ASC, id ASC')
else else
history_object_requested = self.object_lookup( requested_object ) history_object_requested = self.object_lookup( requested_object )
history_object_related = self.object_lookup( related_history_object ) history_object_related = self.object_lookup( related_history_object )
history = History.where( history = History.where(
'((history_object_id = ? AND o_id = ?) OR (history_object_id = ? AND related_o_id = ? )) AND history_type_id IN (?)', '((history_object_id = ? AND o_id = ?) OR (history_object_id = ? AND related_o_id = ? ))',
history_object_requested.id, history_object_requested.id,
requested_object_id, requested_object_id,
history_object_related.id, history_object_related.id,
requested_object_id, requested_object_id,
History::Type.where( :name => ['created', 'updated', 'notification', 'email', 'added', 'removed'] )
). ).
order('created_at ASC, id ASC') order('created_at ASC, id ASC')
end end