diff --git a/.codeclimate.yml b/.codeclimate.yml
index 5a9b41ea73..3802e689be 100644
--- a/.codeclimate.yml
+++ b/.codeclimate.yml
@@ -1,7 +1,9 @@
version: "2"
prepare:
fetch:
- - "https://raw.githubusercontent.com/internetee/style-guide/master/ruby/.rubocop.yml"
+ - "https://raw.githubusercontent.com/internetee/style-guide/master/.rubocop-ruby.yml"
+ - url: "https://raw.githubusercontent.com/internetee/style-guide/master/.rubocop-rails.yml"
+ path: ".rubocop.yml"
plugins:
brakeman:
enabled: true
@@ -20,9 +22,8 @@ plugins:
enabled: true
rubocop:
enabled: true
- channel: rubocop-0-58
+ channel: rubocop-0-74
exclude_patterns:
- - "app/models/legacy/"
- "app/models/version/"
- "bin/"
- "config/"
@@ -35,7 +36,6 @@ exclude_patterns:
- "lib/tasks/bootstrap.rake"
- "lib/tasks/db.rake"
- "lib/tasks/documents.rake"
- - "lib/tasks/import.rake"
- "lib/tasks/legal_doc.rake"
- "lib/tasks/whois.rake"
- "test/"
diff --git a/.editorconfig b/.editorconfig
index 5f4df341d4..95ad0d2d58 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -7,7 +7,7 @@ indent_style = space
indent_size = 2
max_line_length = 100
trim_trailing_whitespace = true
-insert_final_newline = false
+insert_final_newline = true
-[*.{html,erb}]
+[*.{html,erb,js}]
indent_size = 4
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 85e4197ce9..d1fd0ab163 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,34 @@
+28.10.2019
+* Updated kaminari gem to 1.1.1 [#1392](https://github.com/internetee/registry/pull/1392)
+* Downgraded minitest to 5.10.3 due to incompatibility with Rails 5.0 [#1387](https://github.com/internetee/registry/pull/1387)
+* New db constaints to invoices and invoice_items tables [#1388](https://github.com/internetee/registry/pull/1388)
+* Removed buggy code for contact details' fast access in regitrar portal [#1386](https://github.com/internetee/registry/pull/1386)
+
+23.10.2019
+* Updated haml gem to 5.1.2 (CVE-2017-1002201) [#1384](https://github.com/internetee/registry/pull/1384)
+* Removed bullet gem [#378](https://github.com/internetee/registry/issues/378)
+* Removed duplicate route from admin [#1375](https://github.com/internetee/registry/pull/1375)
+
+21.10.2019
+* Tuned PDFkit gem [#1367](https://github.com/internetee/registry/pull/1367)
+* Removed some dead code [#1370](https://github.com/internetee/registry/pull/1370)
+
+17.10.2019
+* Implemented properl handling of contact transfer requests [#1363](https://github.com/internetee/registry/pull/1363)
+* Test environment tuning [#1366](https://github.com/internetee/registry/pull/1366)
+
+16.10.2019
+* Contact and domain list download in portals changed - buttons in stead of dropdown [#1360](https://github.com/internetee/registry/pull/1360)
+* limited epp routes [#1364](https://github.com/internetee/registry/pull/1364)
+
+11.10.2019
+* Fixed mailer previews for couple email templates [#1342](https://github.com/internetee/registry/pull/1342)
+* Updated ransack gem to 1.8 [#1357](https://github.com/internetee/registry/pull/1357)
+* Removed old import rake task [#1355](https://github.com/internetee/registry/pull/1355)
+
+10.10.2019
+* Added DB constraints for reserved and blocked tables [#1338](https://github.com/internetee/registry/pull/1338)
+
08.10.2019
* Removed unused epp routes [#1335](https://github.com/internetee/registry/pull/1335)
* Removed Rspec and coverted specs to tests [#1336](https://github.com/internetee/registry/pull/1336)
diff --git a/Dockerfile b/Dockerfile
index b5871bfed1..7e3b11d804 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,4 @@
FROM internetee/ruby:2.4
-MAINTAINER maciej.szlosarczyk@internet.ee
RUN mkdir -p /opt/webapps/app/tmp/pids
WORKDIR /opt/webapps/app
diff --git a/Gemfile b/Gemfile
index d855cb751c..8660fa47ae 100644
--- a/Gemfile
+++ b/Gemfile
@@ -18,7 +18,8 @@ gem 'figaro', '1.1.1'
# model related
gem 'pg', '0.19.0'
-gem 'ransack', '1.5.1' # for searching
+# 1.8 is for Rails < 5.0
+gem 'ransack', '~> 1.8'
gem 'validates_email_format_of', '1.6.3' # validates email against RFC 2822 and RFC 3696
gem 'paper_trail', '~> 4.0'
@@ -33,9 +34,7 @@ gem 'sass-rails', '5.0.6' # sass style
gem 'coffee-rails', '~> 4.2'
gem 'jquery-rails'
gem 'selectize-rails', '0.12.1' # include selectize.js for select
-
-# view helpers
-gem 'kaminari', '0.16.3' # pagination
+gem 'kaminari'
gem 'coderay', '1.1.0' # xml console visualize
gem 'select2-rails', '3.5.9.3' # for autocomplete
gem 'cancancan'
@@ -68,10 +67,6 @@ gem 'uuidtools', '2.1.5' # For unique IDs (used by the epp gem)
gem 'que', '0.10.0'
gem 'daemons-rails', '1.2.1'
gem 'que-web', '0.4.0'
-
-# for importing legacy db
-gem 'activerecord-import', '0.7.0' # for inserting dummy data
-
gem 'pdfkit'
gem 'jquery-ui-rails', '5.0.5'
gem 'active_model-errors_details' # Backport from Rails 5, https://github.com/rails/rails/pull/18322
@@ -81,7 +76,8 @@ gem 'company_register', github: 'internetee/company_register', branch: :master
gem 'e_invoice', github: 'internetee/e_invoice', branch: :master
gem 'lhv', github: 'internetee/lhv', tag: 'v0.1.0'
gem 'domain_name'
-gem 'haml'
+gem 'haml', '~> 5.0'
+gem 'wkhtmltopdf-binary'
group :development do
# deploy
@@ -89,13 +85,7 @@ group :development do
end
group :development, :test do
- gem 'capybara'
- gem 'selenium-webdriver'
-
- # debug
gem 'pry', '0.10.1'
-
- gem 'bullet', '4.14.7' # for finding database optimizations
gem 'sdoc', '0.4.1' # bundle exec rake doc:rails generates the API under doc/api.
gem 'railroady', '1.3.0' # to generate database diagrams
gem 'autodoc'
@@ -103,7 +93,10 @@ group :development, :test do
end
group :test do
+ gem 'capybara'
gem 'database_cleaner'
gem 'simplecov', require: false
+ gem 'webdrivers'
gem 'webmock'
+ gem 'minitest', '~> 5.10.0'
end
diff --git a/Gemfile.lock b/Gemfile.lock
index c56fb00b87..b414b4ec15 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -89,15 +89,13 @@ GEM
activemodel (= 4.2.11.1)
activesupport (= 4.2.11.1)
arel (~> 6.0)
- activerecord-import (0.7.0)
- activerecord (>= 3.0)
activesupport (4.2.11.1)
i18n (~> 0.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
- addressable (2.6.0)
- public_suffix (>= 2.0.2, < 4.0)
+ addressable (2.7.0)
+ public_suffix (>= 2.0.2, < 5.0)
airbrake (9.4.3)
airbrake-ruby (~> 4.6)
airbrake-ruby (4.6.0)
@@ -121,11 +119,8 @@ GEM
autoprefixer-rails (>= 5.2.1)
sassc (>= 2.0.0)
builder (3.2.3)
- bullet (4.14.7)
- activesupport (>= 3.0.0)
- uniform_notifier (~> 1.9.0)
cancancan (3.0.1)
- capybara (3.22.0)
+ capybara (3.29.0)
addressable
mini_mime (>= 0.1.3)
nokogiri (~> 1.8)
@@ -133,8 +128,7 @@ GEM
rack-test (>= 0.6.3)
regexp_parser (~> 1.5)
xpath (~> 3.2)
- childprocess (0.9.0)
- ffi (~> 1.0, >= 1.0.11)
+ childprocess (3.0.0)
chronic (0.10.2)
coderay (1.1.0)
coercible (1.0.0)
@@ -153,7 +147,7 @@ GEM
unicode_utils (~> 1.4)
crack (0.4.3)
safe_yaml (~> 1.0.0)
- crass (1.0.4)
+ crass (1.0.5)
daemons (1.2.4)
daemons-rails (1.2.1)
daemons
@@ -170,7 +164,7 @@ GEM
responders
warden (~> 1.2.3)
diff-lcs (1.3)
- docile (1.3.1)
+ docile (1.3.2)
domain_name (0.5.20170404)
unf (>= 0.0.5, < 1.0.0)
equalizer (0.0.11)
@@ -190,7 +184,8 @@ GEM
virtus (>= 1.0.0)
gyoku (1.3.1)
builder (>= 2.1.2)
- haml (4.0.7)
+ haml (5.1.2)
+ temple (>= 0.8.0)
tilt
hashdiff (1.0.0)
hpricot (0.8.6)
@@ -213,12 +208,21 @@ GEM
jquery-ui-rails (5.0.5)
railties (>= 3.2.16)
json (1.8.6)
- kaminari (0.16.3)
- actionpack (>= 3.0.0)
- activesupport (>= 3.0.0)
+ kaminari (1.1.1)
+ activesupport (>= 4.1.0)
+ kaminari-actionview (= 1.1.1)
+ kaminari-activerecord (= 1.1.1)
+ kaminari-core (= 1.1.1)
+ kaminari-actionview (1.1.1)
+ actionview
+ kaminari-core (= 1.1.1)
+ kaminari-activerecord (1.1.1)
+ activerecord
+ kaminari-core (= 1.1.1)
+ kaminari-core (1.1.1)
keystores (0.4.0)
libxml-ruby (3.0.0)
- loofah (2.2.3)
+ loofah (2.3.1)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.1)
@@ -232,7 +236,7 @@ GEM
rake
mini_mime (1.0.2)
mini_portile2 (2.4.0)
- minitest (5.11.3)
+ minitest (5.10.3)
monetize (1.9.0)
money (~> 6.12)
money (6.12.0)
@@ -247,6 +251,7 @@ GEM
mustermann-grape (1.0.0)
mustermann (~> 1.0.0)
netrc (0.11.0)
+ nio4r (2.5.2)
nokogiri (1.10.4)
mini_portile2 (~> 2.4.0)
nori (2.6.0)
@@ -258,14 +263,13 @@ GEM
request_store (~> 1.1)
pdfkit (0.8.4.1)
pg (0.19.0)
- polyamorous (1.3.1)
- activerecord (>= 3.0)
pry (0.10.1)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
- public_suffix (3.1.0)
- puma (3.12.1)
+ public_suffix (4.0.1)
+ puma (4.2.1)
+ nio4r (~> 2.0)
que (0.10.0)
que-web (0.4.0)
erubis
@@ -296,8 +300,8 @@ GEM
activesupport (>= 4.2.0, < 5.0)
nokogiri (~> 1.6)
rails-deprecated_sanitizer (>= 1.0.1)
- rails-html-sanitizer (1.2.0)
- loofah (~> 2.2, >= 2.2.2)
+ rails-html-sanitizer (1.3.0)
+ loofah (~> 2.3)
rails-settings-cached (0.7.2)
rails (>= 4.2.0)
railties (4.2.11.1)
@@ -306,15 +310,14 @@ GEM
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (12.3.3)
- ransack (1.5.1)
- actionpack (>= 3.0)
- activerecord (>= 3.0)
- activesupport (>= 3.0)
+ ransack (1.8.10)
+ actionpack (>= 3.0, < 5.2)
+ activerecord (>= 3.0, < 5.2)
+ activesupport (>= 3.0, < 5.2)
i18n
- polyamorous (~> 1.1)
rbtree3 (0.5.0)
rdoc (4.3.0)
- regexp_parser (1.5.1)
+ regexp_parser (1.6.0)
request_store (1.4.1)
rack (>= 1.4)
responders (2.4.1)
@@ -337,7 +340,7 @@ GEM
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.6.0)
rspec-support (3.6.0)
- rubyzip (1.3.0)
+ rubyzip (2.0.0)
safe_yaml (1.0.5)
sass (3.4.23)
sass-rails (5.0.6)
@@ -363,10 +366,10 @@ GEM
select2-rails (3.5.9.3)
thor (~> 0.14)
selectize-rails (0.12.1)
- selenium-webdriver (3.13.0)
- childprocess (~> 0.5)
- rubyzip (~> 1.2)
- simplecov (0.16.1)
+ selenium-webdriver (3.142.6)
+ childprocess (>= 0.5, < 4.0)
+ rubyzip (>= 1.2.2)
+ simplecov (0.17.1)
docile (~> 1.1)
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
@@ -386,9 +389,10 @@ GEM
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
+ temple (0.8.2)
thor (0.20.3)
thread_safe (0.3.6)
- tilt (1.4.1)
+ tilt (2.0.10)
tzinfo (1.2.5)
thread_safe (~> 0.1)
uglifier (4.1.11)
@@ -397,7 +401,6 @@ GEM
unf_ext
unf_ext (0.0.7.2)
unicode_utils (1.4.0)
- uniform_notifier (1.9.0)
uuidtools (2.1.5)
validates_email_format_of (1.6.3)
i18n
@@ -411,12 +414,17 @@ GEM
wasabi (3.5.0)
httpi (~> 2.0)
nokogiri (>= 1.4.2)
+ webdrivers (4.1.3)
+ nokogiri (~> 1.6)
+ rubyzip (>= 1.3.0)
+ selenium-webdriver (>= 3.0, < 4.0)
webmock (3.6.0)
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
whenever (0.9.4)
chronic (>= 0.6.3)
+ wkhtmltopdf-binary (0.12.4)
xpath (3.2.0)
nokogiri (~> 1.8)
@@ -425,11 +433,9 @@ PLATFORMS
DEPENDENCIES
active_model-errors_details
- activerecord-import (= 0.7.0)
airbrake
autodoc
bootstrap-sass (~> 3.4)
- bullet (= 4.14.7)
cancancan
capybara
coderay (= 1.1.0)
@@ -447,14 +453,15 @@ DEPENDENCIES
epp-xml (= 1.1.0)!
figaro (= 1.1.1)
grape
- haml
+ haml (~> 5.0)
isikukood
iso8601 (= 0.8.6)
jquery-rails
jquery-ui-rails (= 5.0.5)
- kaminari (= 0.16.3)
+ kaminari
lhv!
mina (= 0.3.1)
+ minitest (~> 5.10.0)
money-rails
nokogiri
paper_trail (~> 4.0)
@@ -467,20 +474,21 @@ DEPENDENCIES
railroady (= 1.3.0)
rails (= 4.2.11.1)
rails-settings-cached (= 0.7.2)
- ransack (= 1.5.1)
+ ransack (~> 1.8)
rest-client
sass-rails (= 5.0.6)
sdoc (= 0.4.1)
select2-rails (= 3.5.9.3)
selectize-rails (= 0.12.1)
- selenium-webdriver
simplecov
simpleidn (= 0.0.7)
uglifier
uuidtools (= 2.1.5)
validates_email_format_of (= 1.6.3)
+ webdrivers
webmock
whenever (= 0.9.4)
+ wkhtmltopdf-binary
BUNDLED WITH
1.17.3
diff --git a/app/assets/stylesheets/admin/admin.sass b/app/assets/stylesheets/admin/admin.sass
index fe9b569ffb..ddb3fe673f 100644
--- a/app/assets/stylesheets/admin/admin.sass
+++ b/app/assets/stylesheets/admin/admin.sass
@@ -133,12 +133,6 @@ body.login
padding-top: 40px
padding-bottom: 40px
- .form-signin
- .form-signin-heading,
- .form-signin
- .checkbox
- margin-bottom: 10px
-
.form-signin
max-width: 330px
padding: 15px
diff --git a/app/controllers/epp/contacts_controller.rb b/app/controllers/epp/contacts_controller.rb
index 32b2050ca3..b6a26a6263 100644
--- a/app/controllers/epp/contacts_controller.rb
+++ b/app/controllers/epp/contacts_controller.rb
@@ -76,6 +76,12 @@ def renew
handle_errors
end
+ def transfer
+ authorize! :transfer, Epp::Contact
+ epp_errors << { code: '2101', msg: t(:'errors.messages.unimplemented_command') }
+ handle_errors
+ end
+
private
def find_password
diff --git a/app/controllers/epp/domains_controller.rb b/app/controllers/epp/domains_controller.rb
index 2f31f7e5e7..2b708d66c0 100644
--- a/app/controllers/epp/domains_controller.rb
+++ b/app/controllers/epp/domains_controller.rb
@@ -115,8 +115,6 @@ def update
def delete
authorize! :delete, @domain, @password
- # all includes for bullet
- @domain = Epp::Domain.where(id: @domain.id).includes(nameservers: :versions).first
handle_errors(@domain) and return unless @domain.can_be_deleted?
diff --git a/app/controllers/registrant/domains_controller.rb b/app/controllers/registrant/domains_controller.rb
index b8cd8f37a3..fc66806e25 100644
--- a/app/controllers/registrant/domains_controller.rb
+++ b/app/controllers/registrant/domains_controller.rb
@@ -4,11 +4,29 @@ def index
params[:q] ||= {}
normalize_search_parameters do
- @q = current_user_domains.search(params[:q])
- @domains = @q.result.page(params[:page])
+ @q = current_user_domains.search(search_params)
end
- @domains = @domains.per(params[:results_per_page]) if params[:results_per_page].to_i.positive?
+ domains = @q.result
+
+ respond_to do |format|
+ format.html do
+ @domains = domains.page(params[:page])
+ domains_per_page = params[:results_per_page].to_i
+ @domains = @domains.per(domains_per_page) if domains_per_page.positive?
+ end
+ format.csv do
+ raw_csv = @q.result.to_csv
+ send_data raw_csv, filename: 'domains.csv', type: "#{Mime[:csv]}; charset=utf-8"
+ end
+ format.pdf do
+ view = ActionView::Base.new(ActionController::Base.view_paths, domains: domains)
+ raw_html = view.render(file: 'registrant/domains/list_pdf', layout: false)
+ raw_pdf = domains.pdf(raw_html)
+
+ send_data raw_pdf, filename: 'domains.pdf'
+ end
+ end
end
def show
@@ -32,23 +50,6 @@ def confirmation
end
end
- def download_list
- authorize! :view, :registrant_domains
- params[:q] ||= {}
- normalize_search_parameters do
- @q = current_user_domains.search(params[:q])
- @domains = @q
- end
-
- respond_to do |format|
- format.csv { render text: @domains.result.to_csv }
- format.pdf do
- pdf = @domains.result.pdf(render_to_string('registrant/domains/download_list', layout: false))
- send_data pdf, filename: 'domains.pdf'
- end
- end
- end
-
private
def normalize_search_parameters
@@ -70,4 +71,9 @@ def confirmation_url(domain)
registrant_domain_delete_confirm_url(token: domain.registrant_verification_token)
end
end
+
+ def search_params
+ params.require(:q).permit(:name_matches, :registrant_ident_eq, :valid_to_gteq, :valid_to_lteq,
+ :results_per_page)
+ end
end
\ No newline at end of file
diff --git a/app/controllers/registrar/contacts_controller.rb b/app/controllers/registrar/contacts_controller.rb
index f343f9bfb5..49569d7a00 100644
--- a/app/controllers/registrar/contacts_controller.rb
+++ b/app/controllers/registrar/contacts_controller.rb
@@ -16,10 +16,6 @@ def index
search_params[:registrant_domains_id_not_null] = 1
end
- if search_params.length == 1 && search_params[:name_matches].present?
- @contacts = Contact.find_by(name: search_params[:name_matches])
- end
-
if params[:statuses_contains]
contacts = current_registrar_user.registrar.contacts.includes(:registrar).where(
"contacts.statuses @> ?::varchar[]", "{#{params[:statuses_contains].join(',')}}"
@@ -30,37 +26,29 @@ def index
normalize_search_parameters do
@q = contacts.search(search_params)
- @contacts = @q.result(distinct: :true).page(params[:page])
end
- @contacts = @contacts.per(params[:results_per_page]) if params[:results_per_page].to_i.positive?
- end
-
- def download_list
- authorize! :view, Depp::Contact
-
- params[:q] ||= {}
- params[:q].delete_if { |_k, v| v.blank? }
- if params[:q].length == 1 && params[:q][:name_matches].present?
- @contacts = Contact.find_by(name: params[:q][:name_matches])
- end
-
- contacts = current_registrar_user.registrar.contacts.includes(:registrar)
- contacts = contacts.filter_by_states(params[:statuses_contains]) if params[:statuses_contains]
-
- normalize_search_parameters do
- @q = contacts.search(params[:q])
- @contacts = @q.result
- end
+ contacts = @q.result
respond_to do |format|
- format.csv { render text: @contacts.to_csv }
+ format.html do
+ contacts_per_page = params[:results_per_page].to_i
+ @contacts = contacts.page(params[:page])
+ @contacts = @contacts.per(contacts_per_page) if contacts_per_page.positive?
+ end
+ format.csv do
+ raw_csv = contacts.to_csv
+ send_data raw_csv, filename: 'contacts.csv', type: "#{Mime[:csv]}; charset=utf-8"
+ end
format.pdf do
- pdf = @contacts.pdf(render_to_string('registrar/contacts/download_list', layout: false))
- send_data pdf, filename: 'contacts.pdf'
+ view = ActionView::Base.new(ActionController::Base.view_paths, contacts: contacts)
+ view.class_eval { include ::ApplicationHelper }
+ raw_html = view.render(file: 'registrar/contacts/list_pdf', layout: false)
+ raw_pdf = contacts.pdf(raw_html)
+
+ send_data raw_pdf, filename: 'contacts.pdf'
end
end
-
end
def new
diff --git a/app/controllers/registrar/domains_controller.rb b/app/controllers/registrar/domains_controller.rb
index d2969bb69b..bdab2eefc7 100644
--- a/app/controllers/registrar/domains_controller.rb
+++ b/app/controllers/registrar/domains_controller.rb
@@ -47,9 +47,10 @@ def index
domain_presenters << ::DomainPresenter.new(domain: domain, view: view_context)
end
- csv = Registrar::DomainListCSVPresenter.new(domains: domain_presenters, view: view_context).to_s
+ raw_csv = Registrar::DomainListCSVPresenter.new(domains: domain_presenters,
+ view: view_context).to_s
filename = "Domains_#{l(Time.zone.now, format: :filename)}.csv"
- send_data(csv, filename: filename)
+ send_data raw_csv, filename: filename, type: "#{Mime[:csv]}; charset=utf-8"
end
end
end
diff --git a/app/models/ability.rb b/app/models/ability.rb
index 706d851801..3eab0569a7 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -64,6 +64,7 @@ def epp # Registrar/api_user dynamic role
can(:update, Epp::Contact) { |c, pw| c.registrar_id == @user.registrar_id || c.auth_info == pw }
can(:delete, Epp::Contact) { |c, pw| c.registrar_id == @user.registrar_id || c.auth_info == pw }
can(:renew, Epp::Contact)
+ can(:transfer, Epp::Contact)
can(:view_password, Epp::Contact) { |c, pw| c.registrar_id == @user.registrar_id || c.auth_info == pw }
end
diff --git a/app/models/epp/domain.rb b/app/models/epp/domain.rb
index 19933a5ebb..ae08bcb2ea 100644
--- a/app/models/epp/domain.rb
+++ b/app/models/epp/domain.rb
@@ -23,12 +23,8 @@ def validate_contacts
active_admins = admin_domain_contacts.select { |x| !x.marked_for_destruction? }
active_techs = tech_domain_contacts.select { |x| !x.marked_for_destruction? }
- # bullet workaround
- ac = active_admins.map { |x| Contact.find(x.contact_id) }
- tc = active_techs.map { |x| Contact.find(x.contact_id) }
-
# validate registrant here as well
- ([registrant] + ac + tc).each do |x|
+ ([registrant] + active_admins + active_techs).each do |x|
unless x.valid?
add_epp_error('2304', nil, nil, I18n.t(:contact_is_not_valid, value: x.code))
ok = false
@@ -123,9 +119,8 @@ def epp_code_map
def attach_default_contacts
return if registrant.blank?
- regt = Registrant.find(registrant.id) # temp for bullet
- tech_contacts << regt if tech_domain_contacts.blank?
- admin_contacts << regt if admin_domain_contacts.blank? && !regt.org?
+ tech_contacts << registrant if tech_domain_contacts.blank?
+ admin_contacts << registrant if admin_domain_contacts.blank? && !registrant.org?
end
def attrs_from(frame, current_user, action = nil)
diff --git a/app/models/epp/response/result/code.rb b/app/models/epp/response/result/code.rb
index 403f67435f..2a65f67471 100644
--- a/app/models/epp/response/result/code.rb
+++ b/app/models/epp/response/result/code.rb
@@ -16,6 +16,7 @@ class Code
required_parameter_missing: 2003,
parameter_value_range_error: 2004,
parameter_value_syntax_error: 2005,
+ unimplemented: 2101,
billing_failure: 2104,
object_is_not_eligible_for_renewal: 2105,
object_is_not_eligible_for_transfer: 2106,
@@ -43,6 +44,7 @@ class Code
2003 => 'Required parameter missing',
2004 => 'Parameter value range error',
2005 => 'Parameter value syntax error',
+ 2101 => 'Unimplemented command',
2104 => 'Billing failure',
2105 => 'Object is not eligible for renewal',
2106 => 'Object is not eligible for transfer',
diff --git a/app/models/legacy/contact.rb b/app/models/legacy/contact.rb
deleted file mode 100644
index 04f8c34a4b..0000000000
--- a/app/models/legacy/contact.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-module Legacy
- class Contact < Db
- self.table_name = :contact
- belongs_to :object_registry, foreign_key: :id
- belongs_to :object, foreign_key: :id
-
- has_one :object_state, -> { where('valid_to IS NULL') }, foreign_key: :object_id
- end
-end
diff --git a/app/models/legacy/db.rb b/app/models/legacy/db.rb
deleted file mode 100644
index 1cb635b3b9..0000000000
--- a/app/models/legacy/db.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-module Legacy
- class Db < ActiveRecord::Base
- self.abstract_class = true
- begin
- establish_connection :fred
- rescue ActiveRecord::AdapterNotSpecified => e
- logger.info "Legacy 'fred' database support is currently disabled because #{e}"
- end
-
- def readonly?
- true
- end
- end
-end
diff --git a/app/models/legacy/dnskey.rb b/app/models/legacy/dnskey.rb
deleted file mode 100644
index 3fa47f48b9..0000000000
--- a/app/models/legacy/dnskey.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-module Legacy
- class Dnskey < Db
- self.table_name = :dnskey
-
- belongs_to :object_registry, foreign_key: :id
- belongs_to :object, foreign_key: :id
- end
-end
diff --git a/app/models/legacy/domain.rb b/app/models/legacy/domain.rb
deleted file mode 100644
index d0a05d1780..0000000000
--- a/app/models/legacy/domain.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-module Legacy
- class Domain < Db
- self.table_name = :domain
-
- belongs_to :object_registry, foreign_key: :id
- belongs_to :object, foreign_key: :id
- belongs_to :nsset, foreign_key: :nsset
- # belongs_to :registrant, foreign_key: :registrant, primary_key: :legacy_id, class_name: '::Contact'
-
- has_many :object_states, -> { where('valid_to IS NULL') }, foreign_key: :object_id
- has_many :dnskeys, foreign_key: :keysetid, primary_key: :keyset
- has_many :domain_contact_maps, foreign_key: :domainid
- has_many :nsset_contact_maps, foreign_key: :nssetid, primary_key: :nsset
- has_many :domain_histories, foreign_key: :id
- end
-end
diff --git a/app/models/legacy/domain_contact_map.rb b/app/models/legacy/domain_contact_map.rb
deleted file mode 100644
index 4e645ed7fd..0000000000
--- a/app/models/legacy/domain_contact_map.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-module Legacy
- class DomainContactMap < Db
- self.table_name = :domain_contact_map
-
- # belongs_to :contact, foreign_key: :contactid, primary_key: :legacy_id, class_name: '::Contact'
- end
-end
diff --git a/app/models/legacy/domain_history.rb b/app/models/legacy/domain_history.rb
deleted file mode 100644
index 234585ac39..0000000000
--- a/app/models/legacy/domain_history.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-module Legacy
- class DomainHistory < Db
- self.table_name = :domain_history
-
- belongs_to :domain, foreign_key: :id
- end
-end
diff --git a/app/models/legacy/enum_object_state.rb b/app/models/legacy/enum_object_state.rb
deleted file mode 100644
index 00a0968900..0000000000
--- a/app/models/legacy/enum_object_state.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-module Legacy
- class EnumObjectState < Db
- self.table_name = :enum_object_states
- end
-end
diff --git a/app/models/legacy/host.rb b/app/models/legacy/host.rb
deleted file mode 100644
index 4c4eeab099..0000000000
--- a/app/models/legacy/host.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-module Legacy
- class Host < Db
- self.table_name = :host
-
- has_many :host_ipaddr_maps, foreign_key: :hostid
- end
-end
diff --git a/app/models/legacy/host_ipaddr_map.rb b/app/models/legacy/host_ipaddr_map.rb
deleted file mode 100644
index a4dc2f14e8..0000000000
--- a/app/models/legacy/host_ipaddr_map.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-module Legacy
- class HostIpaddrMap < Db
- self.table_name = :host_ipaddr_map
- end
-end
diff --git a/app/models/legacy/invoice.rb b/app/models/legacy/invoice.rb
deleted file mode 100644
index 15441d89ee..0000000000
--- a/app/models/legacy/invoice.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-module Legacy
- class Invoice < Db
- self.table_name = :invoice
- end
-end
diff --git a/app/models/legacy/nsset.rb b/app/models/legacy/nsset.rb
deleted file mode 100644
index 515e9f9a93..0000000000
--- a/app/models/legacy/nsset.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-module Legacy
- class Nsset < Db
- self.table_name = :nsset
-
- belongs_to :object, foreign_key: :id
- belongs_to :object_registry, foreign_key: :id
- has_many :hosts, foreign_key: :nssetid
- end
-end
diff --git a/app/models/legacy/nsset_contact_map.rb b/app/models/legacy/nsset_contact_map.rb
deleted file mode 100644
index f7e0a105bf..0000000000
--- a/app/models/legacy/nsset_contact_map.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-module Legacy
- class NssetContactMap < Db
- self.table_name = :nsset_contact_map
- end
-end
diff --git a/app/models/legacy/object.rb b/app/models/legacy/object.rb
deleted file mode 100644
index 04218cd095..0000000000
--- a/app/models/legacy/object.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-module Legacy
- class Object < Db
- self.table_name = :object
- belongs_to :registrar, foreign_key: :upid, primary_key: :legacy_id, class_name: '::Registrar'
-
- def self.instance_method_already_implemented?(method_name)
- return true if method_name == 'update'
- super
- end
- end
-end
diff --git a/app/models/legacy/object_history.rb b/app/models/legacy/object_history.rb
deleted file mode 100644
index 35115b4d59..0000000000
--- a/app/models/legacy/object_history.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-module Legacy
- class ObjectHistory < Db
- self.table_name = :object_history
-
- belongs_to :object_registry, foreign_key: :historyid
-
- def self.instance_method_already_implemented?(method_name)
- return true if method_name == 'update'
- super
- end
- end
-end
diff --git a/app/models/legacy/object_registry.rb b/app/models/legacy/object_registry.rb
deleted file mode 100644
index 96a6fc6e6b..0000000000
--- a/app/models/legacy/object_registry.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-module Legacy
- class ObjectRegistry < Db
- self.table_name = :object_registry
- self.inheritance_column = nil
- belongs_to :registrar, foreign_key: :crid, primary_key: :legacy_id, class_name: '::Registrar'
- belongs_to :object_history, foreign_key: :historyid
- end
-end
diff --git a/app/models/legacy/object_state.rb b/app/models/legacy/object_state.rb
deleted file mode 100644
index 379d4d175b..0000000000
--- a/app/models/legacy/object_state.rb
+++ /dev/null
@@ -1,81 +0,0 @@
-module Legacy
- class ObjectState < Db
- self.table_name = :object_state
-
- # legacy values. Just for log
- # 2 => "serverRenewProhibited",
- # 5 => "serverOutzoneManual",
- # 6 => "serverInzoneManual",
- # 7 => "serverBlocked",
- # 8 => "expirationWarning",
- # 9 => "expired",
- # 10 => "unguarded",
- # 11 => "validationWarning1",
- # 12 => "validationWarning2",
- # 13 => "notValidated",
- # 14 => "nssetMissing",
- # 15 => "outzone",
- # 18 => "serverRegistrantChangeProhibited",
- # 19 => "deleteWarning",
- # 20 => "outzoneUnguarded",
- # 1 => "serverDeleteProhibited",
- # 3 => "serverTransferProhibited",
- # 4 => "serverUpdateProhibited",
- # 16 => "linked",
- # 17 => "deleteCandidate",
- # 21 => "forceDelete"
-
- # new values
- STATE_NAMES = {
- 2 => "serverRenewProhibited",
- 5 => "serverHold",
- 6 => "serverManualInzone",
- # 7 => "serverBlocked",
- 9 => "expired",
- # 11 => "validationWarning1",
- # 13 => "notValidated",
- 14 => "inactive",
- 15 => "serverHold",
- 18 => "serverRegistrantChangeProhibited",
- 1 => "serverDeleteProhibited",
- 3 => "serverTransferProhibited",
- 4 => "serverUpdateProhibited",
- 16 => "linked",
- 17 => "deleteCandidate", # grupistaatus
- 21 => "serverForceDelete" # grupistaatus
- }.freeze
-
-
- def name
- STATE_NAMES[state_id]
- end
-
- def desc
- map = {
- 1 => "Delete prohibited",
- 2 => "Registration renew prohibited",
- 3 => "Sponsoring registrar change prohibited",
- 4 => "Update prohibited",
- 7 => "Domain blocked",
- 8 => "Expires within 30 days",
- 9 => "Expired",
- 10 => "Domain is 30 days after expiration",
- 11 => "Validation of domain expire in 30 days",
- 12 => "Validation of domain expire in 15 days",
- 13 => "Domain not validated",
- 14 => "Domain has not associated nsset",
- 15 => "Domain is not generated into zone",
- 16 => "Has relation to other records in registry",
- 17 => "Object is going to be deleted",
- 18 => "Registrant change prohibited",
- 19 => "Domain will be deleted in 11 days",
- 20 => "Domain is out of zone after 30 days from expiration",
- 21 => "Domain is forced to delete",
- 5 => "Domain is administratively kept out of zone",
- 6 => "Domain is administratively kept in zone"
- }
-
- map[state_id]
- end
- end
-end
diff --git a/app/models/legacy/registrar.rb b/app/models/legacy/registrar.rb
deleted file mode 100644
index a0a0c251d7..0000000000
--- a/app/models/legacy/registrar.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-module Legacy
- class Registrar < Db
- self.table_name = :registrar
-
- has_many :invoices, foreign_key: :registrarid
- has_many :acl, foreign_key: :registrarid, class_name: "Legacy::RegistrarAcl"
-
- def account_balance
- invoices.sum(:credit)
- end
- end
-end
diff --git a/app/models/legacy/registrar_acl.rb b/app/models/legacy/registrar_acl.rb
deleted file mode 100644
index 711d8a2d65..0000000000
--- a/app/models/legacy/registrar_acl.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-module Legacy
- class RegistrarAcl < Db
- self.table_name = :registraracl
- end
-end
diff --git a/app/models/legacy/zone_ns.rb b/app/models/legacy/zone_ns.rb
deleted file mode 100644
index f430e1b11b..0000000000
--- a/app/models/legacy/zone_ns.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-module Legacy
- class ZoneNs < Db
- self.table_name = :zone_ns
- end
-end
diff --git a/app/views/admin/contacts/partials/_domains.haml b/app/views/admin/contacts/partials/_domains.haml
index 9d7e3edf59..3a60074d18 100644
--- a/app/views/admin/contacts/partials/_domains.haml
+++ b/app/views/admin/contacts/partials/_domains.haml
@@ -1,5 +1,5 @@
- domains = contact.all_domains(page: params[:domain_page], per: 20, params: params)
-#contacts.panel.panel-default
+.panel.panel-default
.panel-heading
.pull-left
= t(:domains)
diff --git a/app/views/admin/contacts/partials/_statuses.haml b/app/views/admin/contacts/partials/_statuses.haml
deleted file mode 100644
index c39075754b..0000000000
--- a/app/views/admin/contacts/partials/_statuses.haml
+++ /dev/null
@@ -1,21 +0,0 @@
-- 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/admin/contacts/partials/_statuses.html.erb b/app/views/admin/contacts/partials/_statuses.html.erb
new file mode 100644
index 0000000000..2d1703c2c7
--- /dev/null
+++ b/app/views/admin/contacts/partials/_statuses.html.erb
@@ -0,0 +1,23 @@
+
+
+ <%= t '.header' %>
+
+
+
+
+
+ | <%= t(:status) %> |
+ <%= t(:notes) %> |
+
+
+
+
+ <% contact.statuses.each do |status| %>
+
+ | <%= status %> |
+ <%= contact.status_notes[status] %> |
+
+ <% end %>
+
+
+
| <%= link_to domain, admin_domain_path(domain) %> |
- <%= link_to domain.registrant, admin_registrant_path(domain.registrant) %> |
+ <%= link_to domain.registrant, admin_contact_path(domain.registrant) %> |
<%= l domain.expire_time %> |
<%= link_to domain.registrar, admin_registrar_path(domain.registrar) %> |
diff --git a/app/views/admin/domains/partials/_owner.haml b/app/views/admin/domains/partials/_owner.haml
index 611cd7dc61..f91cd21770 100644
--- a/app/views/admin/domains/partials/_owner.haml
+++ b/app/views/admin/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, admin_contact_path(@domain.registrant)
%dt= t(:id)
%dd= @domain.registrant.code
diff --git a/app/views/admin/sessions/new.html.erb b/app/views/admin/sessions/new.html.erb
index c875c00ce4..e3e3471771 100644
--- a/app/views/admin/sessions/new.html.erb
+++ b/app/views/admin/sessions/new.html.erb
@@ -16,14 +16,8 @@
required: true,
class: 'form-control' %>
- <% if devise_mapping.rememberable? -%>
-
-
-
- <% end -%>
-
<%= f.submit t('.sign_in_btn'), class: 'btn btn-lg btn-primary btn-block' %>
<% end %>
-<%= render 'links' %>
\ No newline at end of file
+<%= render 'links' %>
diff --git a/app/views/epp/contacts/_disclosure_policy.xml.builder b/app/views/epp/contacts/_disclosure_policy.xml.builder
deleted file mode 100644
index f3ba881596..0000000000
--- a/app/views/epp/contacts/_disclosure_policy.xml.builder
+++ /dev/null
@@ -1,9 +0,0 @@
-if @disclosure_policy
- @disclosure_policy.each do |k,v|
- xml.tag!('contact:disclose', 'flag' => k) do
- v.each do |attr|
- xml.tag!("contact:#{attr}")
- end
- end
- end
-end
diff --git a/app/views/epp/contacts/_postal_info.xml.builder b/app/views/epp/contacts/_postal_info.xml.builder
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/app/views/epp/contacts/info.xml.builder b/app/views/epp/contacts/info.xml.builder
index 0686222035..38a96a7062 100644
--- a/app/views/epp/contacts/info.xml.builder
+++ b/app/views/epp/contacts/info.xml.builder
@@ -75,7 +75,6 @@ xml.epp_head do
xml.tag!('contact:pw', 'No access')
end
end
- # xml << render('/epp/contacts/disclosure_policy')
end
end
if can? :view_full_info, @contact, @password
diff --git a/app/views/registrant/domains/download_list.haml b/app/views/registrant/domains/download_list.haml
deleted file mode 100644
index f0af344cd4..0000000000
--- a/app/views/registrant/domains/download_list.haml
+++ /dev/null
@@ -1,28 +0,0 @@
-!!!
-%html
- %head
- %meta{:content => "text/html; charset=utf-8", "http-equiv" => "Content-Type"}
- %title Contacts
- %body
- .col-md-12
- .table-responsive
- %table.table.table-hover.table-bordered.table-condensed
- %thead
- %tr
- %th{class: 'col-xs-2'}
- =t(:name)
- %th{class: 'col-xs-2'}
- =t('.registrant')
- %th{class: 'col-xs-2'}
- =t(:valid_to)
- %th{class: 'col-xs-2'}
- =t(:registrar_name)
- %tbody
- - @domains.result.each do |x|
- %tr
- %td= x.name
- %td= x.registrant
- %td= l(x.valid_to, format: :short)
- %td= x.registrar
- .row
- .col-md-6
diff --git a/app/views/registrant/domains/index.html.erb b/app/views/registrant/domains/index.html.erb
index acb9afcff3..1254bfbc8c 100644
--- a/app/views/registrant/domains/index.html.erb
+++ b/app/views/registrant/domains/index.html.erb
@@ -18,6 +18,13 @@
<%= f.search_field :registrant_ident_eq, class: 'form-control', placeholder: t(:registrant_ident) %>
+
+
+
+ <%= label_tag t(:results_per_page) %>
+ <%= text_field_tag :results_per_page, params[:results_per_page], class: 'form-control', placeholder: t(:results_per_page) %>
+
+
@@ -32,42 +39,26 @@
<%= f.search_field :valid_to_lteq, value: params[:q][:valid_to_lteq], class: 'form-control js-datepicker', placeholder: t(:valid_to_until) %>
-
-
- <%= label_tag t(:results_per_page) %>
- <%= text_field_tag :results_per_page, params[:results_per_page], class: 'form-control', placeholder: t(:results_per_page) %>
-
-
-
+
+
+
+
+
+ | <%= Domain.human_attribute_name :name %> |
+ <%= Registrant.model_name.human %> |
+ <%= Domain.human_attribute_name :valid_to %> |
+ <%= Registrar.model_name.human %> |
+
+
+
+
+ <% @domains.each do |domain| %>
+
+ | <%= domain.name %> |
+ <%= domain.registrant %> |
+ <%= l(domain.valid_to, format: :short) %> |
+ <%= domain.registrar %> |
+
+ <% end %>
+
+
+
+
+
+
+
+ <%= f.label :name %>
+ <%= f.search_field :name_matches, value: params[:q][:name_matches], class: 'form-control', placeholder: t(:name) %>
+
+
+
+
+
+ <%= f.label t(:id) %>
+ <%= f.search_field :code_eq, class: 'form-control', placeholder: t(:id) %>
+
+
+
+
+
+ <%= f.label t(:ident) %>
+ <%= f.search_field :ident_matches, class: 'form-control', placeholder: t(:ident) %>
+
+
+
+
+
+ <%= label_tag t(:ident_type) %>
+ <%= select_tag '[q][ident_type_eq]', options_for_select(ident_types, params[:q][:ident_type_eq]), { include_blank: true, placeholder: t(:choose), class: 'form-control selectize' } %>
+
+
+
+
+
+ <%= f.label t(:email) %>
+ <%= f.search_field :email_matches, class: 'form-control', placeholder: t(:email) %>
+
+
+
+
+
+ <%= label_tag t(:country) %>
+ <%= select_tag '[q][country_code_eq]', SortedCountry.all_options(params[:q][:country_code_eq]), { include_blank: true, placeholder: t(:choose), class: 'form-control selectize' } %>
+
+
+
+
+
+ <%= label_tag t(:contact_type) %>
+ <%= select_tag '[q][domain_contacts_type_in]', options_for_select([['admin', 'AdminDomainContact'], ['tech', 'TechDomainContact'], ['registrant', 'registrant']], params[:q][:domain_contacts_type_in]), { multiple: true, placeholder: t(:choose), class: 'form-control js-combobox' } %>
+
+
+
+
+
+ <%= f.label t(:registrar_name) %>
+ <%= f.select :registrar_id_eq, Registrar.all.map { |x| [x, x.id] }, { include_blank: true }, class: 'form-control selectize', placeholder: t(:choose) %>
+
+
+
+
+
+ <%= f.label t(:created_at_from) %>
+ <%= f.search_field :created_at_gteq, value: params[:q][:created_at_gteq], class: 'form-control js-datepicker', placeholder: t(:created_at_from) %>
+
+
+
+
+
+ <%= f.label t(:created_at_until) %>
+ <%= f.search_field :created_at_lteq, value: params[:q][:created_at_lteq], class: 'form-control js-datepicker', placeholder: t(:created_at_until) %>
+
+
+
+
+
+ <%= f.label t(:updated_at) %>
+ <%= f.search_field :updated_at_gteq, value: params[:q][:updated_at_gteq], class: 'form-control js-datepicker', placeholder: t(:updated_at) %>
+
+
+
+
+
+ <%= label_tag t(:status) %>
+ <%= select_tag :statuses_contains, options_for_select(Contact::STATUSES, params[:statuses_contains]), { multiple: true, placeholder: t(:choose), class: 'form-control js-combobox' } %>
+
+
+
+
+
+ <%= label_tag t(:results_per_page) %>
+ <%= text_field_tag :results_per_page, params[:results_per_page], class: 'form-control', placeholder: t(:results_per_page) %>
+
+
+
+
+
+ <%= button_tag t('.download_pdf_btn'),
+ formaction: registrar_contacts_path(format: :pdf),
+ name: nil,
+ class: 'btn btn-default' %>
+ <%= button_tag t('.download_csv_btn'),
+ formaction: registrar_contacts_path(format: :csv),
+ name: nil,
+ class: 'btn btn-default' %>
+ <%= link_to(t('.reset_btn'), registrar_contacts_path, class: 'btn btn-default') %>
+
+
+
+ <%= render 'search_form' %>
+
+
+
+
+
+ <%= paginate @contacts %>
+
+
+
+
+
+
+
+
+
+
+ | <%= Contact.human_attribute_name :name %> |
+ <%= Contact.human_attribute_name :code %> |
+ <%= Contact.human_attribute_name :ident %> |
+ <%= Contact.human_attribute_name :created_at %> |
+ <%= Registrar.model_name.human %> |
+
+
+
+
+ <% @contacts.each do |contact| %>
+
+ | <%= contact %> |
+ <%= contact.code %> |
+ <%= ident_for(contact) %> |
+ <%= l(contact.created_at, format: :short) %> |
+ <%= contact.registrar %> |
+
+ <% end %>
+
+
+
+
+
+
- <%= button_tag t('.download_btn'), class: 'btn btn-primary export-domains-csv-btn',
- formaction: registrar_domains_path(format: 'csv') %>
+ <%= button_tag t('.download_btn'), formaction: registrar_domains_path(format: 'csv'),
+ class: 'btn btn-default' %>
<%= link_to t('.reset_btn'), registrar_domains_path, class: 'btn btn-default' %>