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

fixed errors after conflict resolving

Browse source
This commit is contained in:
dinsmol 2021-09-14 14:02:05 +03:00
parent 9cafc98482
commit 7663e1b37f
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/admin/contact_versions_controller.rb
View file

@ -24,7 +24,7 @@ module Admin
end end
end end
versions = Version::ContactVersion.includes(:item).where(whereS).order(created_at: :desc, id: :desc) versions = Version::ContactVersion.includes(:item).where(where_s).order(created_at: :desc, id: :desc)
@q = versions.ransack(params[:q]) @q = versions.ransack(params[:q])
@versions = @q.result.page(params[:page]) @versions = @q.result.page(params[:page])

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

@ -45,7 +45,7 @@ module Admin
end end
where_s += " AND 1=0" if registrars == [] where_s += " AND 1=0" if registrars == []
versions = Version::DomainVersion.includes(:item).where(whereS).order(created_at: :desc, id: :desc) versions = Version::DomainVersion.includes(:item).where(where_s).order(created_at: :desc, id: :desc)
@q = versions.ransack(params[:q]) @q = versions.ransack(params[:q])
@versions = @q.result.page(params[:page]) @versions = @q.result.page(params[:page])