From c013e9789cdf5698b82d0da564fea9e26caac70e Mon Sep 17 00:00:00 2001 From: Vladimir Krylov Date: Thu, 19 Nov 2015 13:39:04 +0200 Subject: [PATCH] Stroy#108423414 links in contact view's domain list use registrar --- .../registrar/contacts/partials/_domains.haml | 30 +++++++++++++++++++ app/views/registrar/contacts/show.haml | 2 +- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 app/views/registrar/contacts/partials/_domains.haml diff --git a/app/views/registrar/contacts/partials/_domains.haml b/app/views/registrar/contacts/partials/_domains.haml new file mode 100644 index 000000000..ab590cd85 --- /dev/null +++ b/app/views/registrar/contacts/partials/_domains.haml @@ -0,0 +1,30 @@ +- domains = contact.all_domains(page: params[:domain_page], per: 20, params: params) +#contacts.panel.panel-default + .panel-heading + .pull-left + = t(:domains) + .pull-right + = form_tag request.path, method: :get do + = select_tag :domain_filter, options_for_select(%w(Registrant AdminDomainContact TechDomainContact), selected: params[:domain_filter]), + include_blank: true, class: 'form-control2 selectize2' + %button.btn.btn-primary + %span.glyphicon.glyphicon-search + .clearfix + + .table-responsive + %table.table.table-hover.table-bordered.table-condensed + %thead + %tr + %th{class: 'col-xs-3'}=custom_sort_link t(:domain_name), :name + %th{class: 'col-xs-3'}=custom_sort_link t(:registrar), :registrar_name + %th{class: 'col-xs-3'}=custom_sort_link t(:valid_to), :valid_to + %th{class: 'col-xs-3'}= t(:roles) + %tbody + - domains.each do |x| + %tr + %td= link_to(x.name, info_registrar_domains_path(domain_name: x.name)) + %td= link_to(x.registrar, registrar_contact_path(id: x.registrant.code)) + %td= l(x.valid_to, format: :short) + %td= x.roles.join(", ") + += paginate domains, param_name: :domain_page \ No newline at end of file diff --git a/app/views/registrar/contacts/show.haml b/app/views/registrar/contacts/show.haml index 96faa4ecc..41eda46c2 100644 --- a/app/views/registrar/contacts/show.haml +++ b/app/views/registrar/contacts/show.haml @@ -10,7 +10,7 @@ .row .col-md-12= render 'registrar/contacts/partials/statuses', statuses: @contact.statuses .row - .col-md-12= render 'admin/contacts/partials/domains', contact: Contact.find_by(code: params[:id]) + .col-md-12= render 'registrar/contacts/partials/domains', contact: Contact.find_by(code: params[:id]) - else .row