zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-07-21 18:26:06 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'story/115762063--show-historical-nested' into staging

Browse source
This commit is contained in:
Vladimir Krylov 2016-03-30 17:38:03 +03:00
commit acd7963616
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/models/concerns/versions.rb
View file

@ -60,7 +60,7 @@ module Versions
module ClassMethods
def all_versions_for(ids, time)
ver_klass = paper_trail_version_class
from_history = ver_klass.where(item_id: ids).
from_history = ver_klass.where(item_id: ids.to_a).
order(:item_id).
preceding(time + 1, true).
select("distinct on (item_id) #{ver_klass.table_name}.*").
@ -70,7 +70,7 @@ module Versions
ver.object_changes.to_h.each { |k, v| o[k]=v[-1] }
o
end
not_in_history = where(id: (ids - from_history.map(&:id)))
not_in_history = where(id: (ids.to_a - from_history.map(&:id)))
from_history + not_in_history
end