zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-05-28 13:51:41 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '108869472-objects_archive' into staging

Browse source
This commit is contained in:
Stas 2016-04-14 18:21:46 +03:00
commit b20a0ae2b2
3 changed files with 27 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -9,12 +9,12 @@ class Admin::DomainVersionsController < AdminController
search_params = params[:q].deep_dup
if search_params[:registrant]
registrant = Contact.find_by(name: search_params[:registrant])
registrant = Contact.find_by(name: search_params[:registrant].strip)
search_params.delete(:registrant)
end
if search_params[:registrar]
registrar = Registrar.find_by(name: search_params[:registrar])
registrar = Registrar.find_by(name: search_params[:registrar].strip)
search_params.delete(:registrar)
end

21
app/views/admin/contact_versions/index.haml
View file

@ -25,7 +25,7 @@
.col-md-3
.form-group
= label_tag :action
= select_tag '[q][event]', options_for_select([['Update', 'update'], ['Destroy', 'destroy']], params[:q][:event]), { include_blank:true, multiple: false, placeholder: t(:choose), class: 'form-control js-combobox' }
= select_tag '[q][event]', options_for_select([['Update', 'update'], ['Destroy', 'destroy'], ['Create', 'create']], params[:q][:event]), { include_blank:true, multiple: false, placeholder: t(:choose), class: 'form-control js-combobox' }
.col-md-3
.form-group
= label_tag t(:results_per_page)
@ -62,15 +62,18 @@
= t(:action)
%tbody
- @versions.each do |version|
- if version.reify
- if version
- contact = Contact.new(version.object.to_h)
- version.object_changes.to_h.each{|k,v| contact[k]=v.last}
%tr
%td= link_to(version.reify.name, admin_contact_version_path(version.id))
%td= version.reify.code
%td= ident_for(version.reify)
%td= version.reify.phone
%td= link_to(contact.name, admin_contact_version_path(version.id))
%td= contact.code
%td= ident_for(contact)
%td= contact.phone
%td
- if version.reify.registrar
= link_to(version.reify.registrar, admin_registrar_path(version.reify.registrar))
- if contact.registrar
= link_to(contact.registrar, admin_registrar_path(contact.registrar))
%td= l(version.created_at, format: :short)
%td= version.event
@ -79,6 +82,8 @@
.col-md-6
= paginate @versions
.col-md-6.text-right
.pagination
= t(:result_count, count: @versions.total_count)
:coffee

19
app/views/admin/domain_versions/archive.haml
View file

@ -19,7 +19,7 @@
.col-md-3
.form-group
= label_tag :action
= select_tag '[q][event]', options_for_select([['Update', 'update'], ['Destroy', 'destroy']], params[:q][:event]), { include_blank:true, multiple: false, placeholder: t(:choose), class: 'form-control js-combobox' }
= select_tag '[q][event]', options_for_select([['Update', 'update'], ['Destroy', 'destroy'], ['Create', 'create']], params[:q][:event]), { include_blank:true, multiple: false, placeholder: t(:choose), class: 'form-control js-combobox' }
.row
.col-md-3
.col-md-3
@ -55,15 +55,18 @@
= t(:action)
%tbody
- @versions.each do |version|
- if version.reify
- if version
- domain = Domain.new(version.object.to_h)
- version.object_changes.to_h.each{|k,v| domain[k]=v.last}
%tr
%td= link_to(version.reify.name, admin_domain_version_path(version.id))
%td= link_to(domain.name, admin_domain_version_path(version.id))
%td
- if version.reify.registrant
= link_to(version.reify.registrant, admin_registrant_path(version.reify.registrant))
- if domain.registrant
= domain.registrant
%td
- if version.reify.registrar
= link_to(version.reify.registrar, admin_registrar_path(version.reify.registrar))
- if domain.registrar
= link_to(domain.registrar, admin_registrar_path(domain.registrar))
%td= l(version.created_at, format: :short)
%td= version.event
@ -72,6 +75,8 @@
.col-md-6
= paginate @versions
.col-md-6.text-right
.pagination
= t(:result_count, count: @versions.total_count)
:coffee