From 216c4e9fa0fff907b57bca9c95eba017828877f6 Mon Sep 17 00:00:00 2001 From: Stas Date: Mon, 25 Jan 2016 17:53:38 +0200 Subject: [PATCH] 105842700-routes_fix --- .../registrant/contacts_controller.rb | 8 ++++ .../contacts/partials/_address.haml | 23 ++++++++++ .../contacts/partials/_domains.haml | 30 +++++++++++++ .../contacts/partials/_general.haml | 45 +++++++++++++++++++ .../registrant/contacts/partials/_search.haml | 6 +++ .../contacts/partials/_statuses.haml | 21 +++++++++ app/views/registrant/contacts/show.haml | 12 +++++ .../domains/partials/_admin_contacts.haml | 2 +- .../registrant/domains/partials/_general.haml | 2 +- .../domains/partials/_keyrelays.haml | 6 +-- .../domains/partials/_legal_documents.haml | 2 +- .../registrant/domains/partials/_owner.haml | 2 +- .../domains/partials/_tech_contacts.haml | 2 +- app/views/registrant/domains/show.haml | 4 +- app/views/registrant/registrants/index.haml | 8 ++-- app/views/registrant/registrars/index.haml | 5 +-- config/routes.rb | 1 + 17 files changed, 161 insertions(+), 18 deletions(-) create mode 100644 app/controllers/registrant/contacts_controller.rb create mode 100644 app/views/registrant/contacts/partials/_address.haml create mode 100644 app/views/registrant/contacts/partials/_domains.haml create mode 100644 app/views/registrant/contacts/partials/_general.haml create mode 100644 app/views/registrant/contacts/partials/_search.haml create mode 100644 app/views/registrant/contacts/partials/_statuses.haml create mode 100644 app/views/registrant/contacts/show.haml diff --git a/app/controllers/registrant/contacts_controller.rb b/app/controllers/registrant/contacts_controller.rb new file mode 100644 index 000000000..d3a0ddff8 --- /dev/null +++ b/app/controllers/registrant/contacts_controller.rb @@ -0,0 +1,8 @@ +class Registrant::ContactsController < RegistrantController + + def show + @contact = Contact.find(params[:id]) + authorize! :read, @contact + @contact.valid? + end +end \ No newline at end of file diff --git a/app/views/registrant/contacts/partials/_address.haml b/app/views/registrant/contacts/partials/_address.haml new file mode 100644 index 000000000..9c0f548e3 --- /dev/null +++ b/app/views/registrant/contacts/partials/_address.haml @@ -0,0 +1,23 @@ +.panel.panel-default + .panel-heading + %h3.panel-title= t(:address) + .panel-body + %dl.dl-horizontal + - if @contact.org_name.present? + %dt= t(:org_name) + %dd= @contact.org_name + + %dt= t(:street) + %dd= @contact.street.to_s.gsub("\n", '
').html_safe + + %dt= t(:city) + %dd= @contact.city + + %dt= t(:zip) + %dd= @contact.zip + + %dt= t(:state) + %dd= @contact.state + + %dt= t(:country) + %dd= @contact.country diff --git a/app/views/registrant/contacts/partials/_domains.haml b/app/views/registrant/contacts/partials/_domains.haml new file mode 100644 index 000000000..d0180532d --- /dev/null +++ b/app/views/registrant/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, [:registrant, x]) + %td= link_to(x.registrar, [:registrant, x.registrar]) + %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/registrant/contacts/partials/_general.haml b/app/views/registrant/contacts/partials/_general.haml new file mode 100644 index 000000000..36192cb2c --- /dev/null +++ b/app/views/registrant/contacts/partials/_general.haml @@ -0,0 +1,45 @@ +.panel.panel-default + .panel-heading + %h3.panel-title= t(:general) + .panel-body + %dl.dl-horizontal + %dt= t(:id) + %dd= @contact.code + + %dt= t(:password) + %dd + = text_field_tag :auth_info, @contact.auth_info, readonly: true, class: 'partially-hidden' + + %br + + %dt= t(:ident) + %dd= ident_for(@contact) + + %dt= t(:email) + %dd= @contact.email + + %dt= t(:phone) + %dd= @contact.phone + + - if @contact.fax + %dt= t(:fax) + %dd= @contact.fax + + %br + + %dt= t(:created) + %dd + = l(@contact.created_at, format: :short) + by + = creator_link(@contact) + + %dt= t(:updated) + %dd + = l(@contact.updated_at, format: :short) + by + = updator_link(@contact) + + %dt= t(:registrar) + %dd + - if @contact.registrar.present? + = link_to(@contact.registrar, registrant_registrar_path(@contact.registrar)) diff --git a/app/views/registrant/contacts/partials/_search.haml b/app/views/registrant/contacts/partials/_search.haml new file mode 100644 index 000000000..4a723bf6b --- /dev/null +++ b/app/views/registrant/contacts/partials/_search.haml @@ -0,0 +1,6 @@ += search_form_for [:registrant, @q] do |f| + = f.search_field :name_cont + = f.submit do + %span.glyphicon.glyphicon-search + + diff --git a/app/views/registrant/contacts/partials/_statuses.haml b/app/views/registrant/contacts/partials/_statuses.haml new file mode 100644 index 000000000..c39075754 --- /dev/null +++ b/app/views/registrant/contacts/partials/_statuses.haml @@ -0,0 +1,21 @@ +- panel_class = contact.errors.messages[:statuses] ? 'panel-danger' : 'panel-default' +#contact_statuses.panel{class: panel_class} + .panel-heading.clearfix + = t(:statuses) + .table-responsive + %table.table.table-hover.table-bordered.table-condensed + %thead + %tr + %th{class: 'col-xs-6'}= t(:status) + %th{class: 'col-xs-6'}= t(:notes) + %tbody + - contact.statuses.each do |status| + %tr + %td= status + %td= contact.status_notes[status] + + - if contact.errors.messages[:statuses] + %tfoot + - @domain.errors.messages[:statuses].each do |s| + %tr + %td{colspan: 4}= s diff --git a/app/views/registrant/contacts/show.haml b/app/views/registrant/contacts/show.haml new file mode 100644 index 000000000..57915e9ff --- /dev/null +++ b/app/views/registrant/contacts/show.haml @@ -0,0 +1,12 @@ +- content_for :actions do + = render 'shared/title', name: @contact.name + +.row + .col-md-6= render 'registrant/contacts/partials/general' + .col-md-6= render 'registrant/contacts/partials/address' +.row + .col-md-12= render 'registrant/contacts/partials/statuses', contact: @contact +.row + .col-md-12= render 'registrant/contacts/partials/domains', contact: @contact + + diff --git a/app/views/registrant/domains/partials/_admin_contacts.haml b/app/views/registrant/domains/partials/_admin_contacts.haml index 0db8f6e32..5e49d3fbc 100644 --- a/app/views/registrant/domains/partials/_admin_contacts.haml +++ b/app/views/registrant/domains/partials/_admin_contacts.haml @@ -12,7 +12,7 @@ %tbody - @domain.admin_contacts.each do |ac| %tr - %td= link_to(ac, admin_contact_path(ac)) + %td= link_to(ac, registrant_contact_path(ac)) %td= ac.code %td= ac.email - if @domain.errors.messages[:admin_contacts] diff --git a/app/views/registrant/domains/partials/_general.haml b/app/views/registrant/domains/partials/_general.haml index d1a17c1cc..d80c1ce6a 100644 --- a/app/views/registrant/domains/partials/_general.haml +++ b/app/views/registrant/domains/partials/_general.haml @@ -10,7 +10,7 @@ %dd= l(@domain.registered_at) %dt= t(:registrar) - %dd= link_to(@domain.registrar, admin_registrar_path(@domain.registrar)) + %dd= link_to(@domain.registrar, registrant_registrar_path(@domain.registrar)) %dt= t(:authinfo_pw) %dd diff --git a/app/views/registrant/domains/partials/_keyrelays.haml b/app/views/registrant/domains/partials/_keyrelays.haml index 43d099383..d2d39f6ba 100644 --- a/app/views/registrant/domains/partials/_keyrelays.haml +++ b/app/views/registrant/domains/partials/_keyrelays.haml @@ -13,8 +13,8 @@ %tbody - @domain.keyrelays.includes([:requester, :accepter]).order(pa_date: :desc).each do |x| %tr - %td= link_to(x.pa_date, [:admin, x]) + %td= link_to(x.pa_date, [:registrar, x]) %td= x.expiry - %td= link_to(x.requester, [:admin, x.requester]) - %td= link_to(x.accepter, [:admin, x.accepter]) + %td= link_to(x.requester, [:registrar, x.requester]) + %td= link_to(x.accepter, [:registrar, x.accepter]) %td= x.status diff --git a/app/views/registrant/domains/partials/_legal_documents.haml b/app/views/registrant/domains/partials/_legal_documents.haml index 900a9784a..7d740977b 100644 --- a/app/views/registrant/domains/partials/_legal_documents.haml +++ b/app/views/registrant/domains/partials/_legal_documents.haml @@ -10,5 +10,5 @@ %tbody - legal_documents.each do |x| %tr - %td= link_to(x.created_at, [:admin, x]) + %td= link_to(x.created_at, [:registrar, x]) %td= x.document_type diff --git a/app/views/registrant/domains/partials/_owner.haml b/app/views/registrant/domains/partials/_owner.haml index 7f499f86b..a7c678d56 100644 --- a/app/views/registrant/domains/partials/_owner.haml +++ b/app/views/registrant/domains/partials/_owner.haml @@ -4,7 +4,7 @@ .panel-body %dl.dl-horizontal %dt= t(:name) - %dd= link_to(@domain.registrant, [:admin, @domain.registrant]) + %dd= link_to(@domain.registrant, [:registrar, @domain.registrant]) %dt= t(:id) %dd= @domain.registrant_code diff --git a/app/views/registrant/domains/partials/_tech_contacts.haml b/app/views/registrant/domains/partials/_tech_contacts.haml index 20badbea8..12844a41e 100644 --- a/app/views/registrant/domains/partials/_tech_contacts.haml +++ b/app/views/registrant/domains/partials/_tech_contacts.haml @@ -12,7 +12,7 @@ %tbody - @domain.tech_contacts.each do |tc| %tr - %td= link_to(tc, admin_contact_path(tc)) + %td= link_to(tc, registrant_contact_path(tc)) %td= tc.code %td= tc.email - if @domain.errors.messages[:tech_contacts] diff --git a/app/views/registrant/domains/show.haml b/app/views/registrant/domains/show.haml index 50c0409b2..0c1ceb48e 100644 --- a/app/views/registrant/domains/show.haml +++ b/app/views/registrant/domains/show.haml @@ -1,7 +1,5 @@ - content_for :actions do - -#= link_to(t(:history), admin_domain_domain_versions_path(@domain.id), method: :get, class: 'btn btn-primary') - -= render 'shared/title', name: @domain.name + = render 'shared/title', name: @domain.name .row .col-md-6= render 'registrant/domains/partials/general' diff --git a/app/views/registrant/registrants/index.haml b/app/views/registrant/registrants/index.haml index b8e7850e6..11838d1b2 100644 --- a/app/views/registrant/registrants/index.haml +++ b/app/views/registrant/registrants/index.haml @@ -2,7 +2,7 @@ .row .col-md-12 - = search_form_for [:admin, @q], html: { style: 'margin-bottom: 0;', class: 'js-form', autocomplete: 'off' } do |f| + = search_form_for [:registrar, @q], html: { style: 'margin-bottom: 0;', class: 'js-form', autocomplete: 'off' } do |f| .row .col-md-3 .form-group @@ -91,13 +91,13 @@ %tbody - @contacts.each do |contact| %tr - %td= link_to(contact, admin_contact_path(contact)) + %td= link_to(contact, registrar_contact_path(contact)) %td= contact.code %td= ident_for(contact) %td= l(contact.created_at, format: :short) %td - if contact.registrar - = link_to(contact.registrar, admin_registrar_path(contact.registrar)) + = link_to(contact.registrar, registrar_registrar_path(contact.registrar)) .row .col-md-6 @@ -109,4 +109,4 @@ :coffee $(".js-reset-form").on "click", (e) -> e.preventDefault(); - window.location = "#{admin_contacts_path}" + window.location = "#{registrar_contacts_path}" diff --git a/app/views/registrant/registrars/index.haml b/app/views/registrant/registrars/index.haml index a2604dbec..0489bcf52 100644 --- a/app/views/registrant/registrars/index.haml +++ b/app/views/registrant/registrars/index.haml @@ -1,6 +1,5 @@ - content_for :actions do - = link_to(t(:new), new_admin_registrar_path, class: 'btn btn-primary') -= render 'shared/title', name: t(:registrars) + = render 'shared/title', name: t(:registrars) .row .col-md-12 @@ -15,7 +14,7 @@ %tbody - @registrars.each do |x| %tr - %td= link_to(x, [:admin, x]) + %td= link_to(x, [:registrar, x]) %td= x.reg_no .row .col-md-12 diff --git a/config/routes.rb b/config/routes.rb index 9a91027cc..6b3cbe00a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -155,6 +155,7 @@ Rails.application.routes.draw do end resources :registrants + resources :contacts resources :whois # resources :contacts do