zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-05-17 09:57:23 +02:00
Code Issues Projects Releases Packages Wiki Activity

108869472-filter_and_view_fixes

Browse source
This commit is contained in:
Stas 2016-07-08 11:28:27 +03:00
parent 8d35fe9e77
commit b013acad7c
4 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/controllers/admin/domain_versions_controller.rb
View file

@ -25,6 +25,8 @@ class Admin::DomainVersionsController < AdminController
case key
when 'event'
whereS += " AND event = '#{value}'"
when 'name'
whereS += " AND (object->>'name' ~* '#{value}' OR object_changes->>'name' ~* '#{value}')"
else
whereS += create_where_string(key, value)
end
@ -47,11 +49,12 @@ class Admin::DomainVersionsController < AdminController
per_page = 7
@version = DomainVersion.find(params[:id])
@versions = DomainVersion.where(item_id: @version.item_id).order(id: :desc)
@versions_map = @versions.all.map(&:id)
# what we do is calc amount of results until needed version
# then we cacl which page it is
if params[:page].blank?
counter = @versions.where("id > ?", @version.id).count
counter = @versions_map.index(@version.id) + 1
page = counter / per_page
page += 1 if (counter % per_page) != 0
params[:page] = page