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

Fix tests that failed after merging master

Browse source 
Also, fix rubocop issues
This commit is contained in:
Maciej Szlosarczyk 2018-08-24 13:17:08 +03:00
parent 0dc0ac4d16
commit c92fc25683
No known key found for this signature in database
GPG key ID: 41D62D42D3B0D765
4 changed files with 28 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/models/registrant_user.rb
View file

@ -1,5 +1,5 @@
class RegistrantUser < User class RegistrantUser < User
ACCEPTED_ISSUER = 'AS Sertifitseerimiskeskus' ACCEPTED_ISSUER = 'AS Sertifitseerimiskeskus'.freeze
attr_accessor :idc_data attr_accessor :idc_data
def ability def ability
@ -17,8 +17,8 @@ class RegistrantUser < User
def domains def domains
Domain.uniq Domain.uniq
.joins(:contacts) .joins(:contacts)
.where(contacts: { ident_type: 'priv', ident: ident, ident_country_code: country_code }) .where(contacts: { ident_type: 'priv', ident: ident, ident_country_code: country_code })
end end
def contacts def contacts
@ -31,7 +31,7 @@ class RegistrantUser < User
def administrated_domains def administrated_domains
domains_where_is_administrative_contact = begin domains_where_is_administrative_contact = begin
Domain.joins(:domain_contacts) Domain.joins(:domain_contacts)
.where(domain_contacts: { contact_id: contacts, type: [AdminDomainContact] }) .where(domain_contacts: { contact_id: contacts, type: [AdminDomainContact] })
end end
domains_where_is_registrar = Domain.where(registrant_id: contacts) domains_where_is_registrar = Domain.where(registrant_id: contacts)
@ -55,13 +55,13 @@ class RegistrantUser < User
user_data = {} user_data = {}
# handling here new and old mode # handling here new and old mode
if idc_data.starts_with?("/") if idc_data.starts_with?('/')
user_data[:ident] = idc_data.scan(/serialNumber=(\d+)/).flatten.first user_data[:ident] = idc_data.scan(/serialNumber=(\d+)/).flatten.first
user_data[:country_code] = idc_data.scan(/^\/C=(.{2})/).flatten.first user_data[:country_code] = idc_data.scan(/^\/C=(.{2})/).flatten.first
user_data[:first_name] = idc_data.scan(%r{/GN=(.+)/serialNumber}).flatten.first user_data[:first_name] = idc_data.scan(%r{/GN=(.+)/serialNumber}).flatten.first
user_data[:last_name] = idc_data.scan(%r{/SN=(.+)/GN}).flatten.first user_data[:last_name] = idc_data.scan(%r{/SN=(.+)/GN}).flatten.first
else else
parse_str = "," + idc_data parse_str = ',' + idc_data
user_data[:ident] = parse_str.scan(/,serialNumber=(\d+)/).flatten.first user_data[:ident] = parse_str.scan(/,serialNumber=(\d+)/).flatten.first
user_data[:country_code] = parse_str.scan(/,C=(.{2})/).flatten.first user_data[:country_code] = parse_str.scan(/,C=(.{2})/).flatten.first
user_data[:first_name] = parse_str.scan(/,GN=([^,]+)/).flatten.first user_data[:first_name] = parse_str.scan(/,GN=([^,]+)/).flatten.first

6
app/presenters/domain_presenter.rb
View file

@ -77,7 +77,7 @@ class DomainPresenter
def schedule_force_delete_btn def schedule_force_delete_btn
view.content_tag(:a, view.t('admin.domains.force_delete_toggle_btn.schedule'), view.content_tag(:a, view.t('admin.domains.force_delete_toggle_btn.schedule'),
class: 'btn btn-default', class: 'dropdown-item',
data: { data: {
toggle: 'modal', toggle: 'modal',
target: '.domain-edit-force-delete-dialog', target: '.domain-edit-force-delete-dialog',
@ -91,14 +91,14 @@ class DomainPresenter
data: { data: {
confirm: view.t('admin.domains.force_delete_toggle_btn.cancel_confirm'), confirm: view.t('admin.domains.force_delete_toggle_btn.cancel_confirm'),
}, },
class: 'btn btn-primary' class: 'dropdown-item'
end end
def inactive_schedule_force_delete_btn def inactive_schedule_force_delete_btn
view.content_tag :button, view.t('admin.domains.force_delete_toggle_btn.schedule'), view.content_tag :button, view.t('admin.domains.force_delete_toggle_btn.schedule'),
title: view.t('admin.domains.force_delete_toggle_btn.unable_to_schedule'), title: view.t('admin.domains.force_delete_toggle_btn.unable_to_schedule'),
disabled: true, disabled: true,
class: 'btn btn-default' class: 'dropdown-item'
end end
attr_reader :domain attr_reader :domain

24
app/views/admin/domains/edit.html.erb
View file

@ -5,15 +5,27 @@
<li><%= link_to @domain, admin_domain_path(@domain) %></li> <li><%= link_to @domain, admin_domain_path(@domain) %></li>
</ol> </ol>
<div class="page-header"> <div class="page-header">
<div class="row"> <div class="row">
<div class="col-sm-4"> <div class="col-sm-8">
<h1><%= t '.header', domain: domain.name %></h1> <h1 class="text-center-xs">
<%= t '.header' %> <%= domain.name_with_status %>
</h1>
</div> </div>
<div class="col-sm-4 text-right">
<div class="col-sm-8 text-right"> <div class="btn-group">
<%= link_to t('.add_new_status_btn'), '#', class: 'btn btn-primary js-add-status' %> <button class="btn btn-primary" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<%= domain.force_delete_toggle_btn %> Actions
<span class="caret"></span>
</button>
<ul class="dropdown-menu">
<li><%= domain.force_delete_toggle_btn %></li>
<li><%= domain.remove_registry_lock_btn %></li>
<div class="divider"></div>
<li><%= link_to t('.add_new_status_btn'), '#', class: 'js-add-status' %></li>
</ul>
</div>
</div> </div>
</div> </div>
</div> </div>

2
config/locales/admin/domains.en.yml
View file

@ -13,7 +13,7 @@ en:
reset_btn: Reset reset_btn: Reset
edit: edit:
header: "Edit: %{domain}" header: "Edit:"
add_new_status_btn: Add new status add_new_status_btn: Add new status
force_delete_dialog: force_delete_dialog: