mirror of
https://github.com/internetee/registry.git
synced 2025-08-05 17:28:18 +02:00
Merge branch 'master' into improve-registrant-area
# Conflicts: # test/fixtures/contacts.yml
This commit is contained in:
commit
3ca95364ef
51 changed files with 1021 additions and 235 deletions
|
@ -13,8 +13,13 @@ en:
|
|||
reset_btn: Reset
|
||||
|
||||
edit:
|
||||
header: "Edit: %{domain}"
|
||||
header: "Edit:"
|
||||
add_new_status_btn: Add new status
|
||||
keep_btn: Remove deleteCandidate status
|
||||
keep_btn_confirm: Are you sure you want to remove deleteCandidate status?
|
||||
|
||||
keep:
|
||||
kept: deleteCandidate status has been removed
|
||||
|
||||
force_delete_dialog:
|
||||
title: Force delete
|
||||
|
@ -23,6 +28,13 @@ en:
|
|||
close_btn: Close dialog
|
||||
submit_btn: Force delete domain
|
||||
|
||||
registry_lock:
|
||||
destroy:
|
||||
btn: Remove registry lock
|
||||
confirm: Are you sure you want to remove the registry lock?
|
||||
success: Registry lock removed
|
||||
error: Registry lock could not be removed
|
||||
|
||||
versions:
|
||||
time: Time
|
||||
registrant: Registrant
|
||||
|
@ -33,6 +45,8 @@ en:
|
|||
general:
|
||||
outzone_time: Outzone time
|
||||
delete_time: Delete time
|
||||
force_delete_time: Force delete time
|
||||
locked_by_registrant_at: Registry lock time
|
||||
|
||||
admin_contacts:
|
||||
title: Admin. contacts
|
||||
|
@ -48,4 +62,4 @@ en:
|
|||
unable_to_schedule: >
|
||||
Force delete procedure cannot be scheduled while a domain has deleteCandidate status
|
||||
cancel: Cancel force delete
|
||||
cancel_confirm: Are you sure you want cancel force delete procedure?
|
||||
cancel_confirm: Are you sure you want cancel force delete procedure?
|
||||
|
|
|
@ -23,7 +23,9 @@ Rails.application.routes.draw do
|
|||
namespace :registrant do
|
||||
post 'auth/eid', to: 'auth#eid'
|
||||
|
||||
resources :domains, only: %i[index show], param: :uuid
|
||||
resources :domains, only: %i[index show], param: :uuid do
|
||||
resource :registry_lock, only: %i[create destroy]
|
||||
end
|
||||
resources :contacts, only: %i[index show], param: :uuid
|
||||
end
|
||||
end
|
||||
|
@ -191,11 +193,16 @@ Rails.application.routes.draw do
|
|||
match 'forward', via: [:post, :get]
|
||||
end
|
||||
|
||||
resources :domains do
|
||||
resources :domains, except: %i[new create destroy] do
|
||||
resources :domain_versions, controller: 'domains', action: 'versions'
|
||||
resources :pending_updates
|
||||
resources :pending_deletes
|
||||
resource :force_delete, controller: 'domains/force_delete', only: %i[create destroy]
|
||||
resource :registry_lock, controller: 'domains/registry_lock', only: :destroy
|
||||
|
||||
member do
|
||||
patch :keep
|
||||
end
|
||||
end
|
||||
|
||||
resources :domain_versions do
|
||||
|
@ -262,4 +269,4 @@ Rails.application.routes.draw do
|
|||
|
||||
# To prevent users seeing the default welcome message "Welcome aboard" from Rails
|
||||
root to: redirect('admin/sign_in')
|
||||
end
|
||||
end
|
||||
|
|
|
@ -57,6 +57,10 @@ if @cron_group == 'registry'
|
|||
every :day, at: '19:00pm' do
|
||||
runner 'Directo.send_receipts'
|
||||
end if @environment == 'production'
|
||||
|
||||
every 42.minutes do
|
||||
rake 'domain:discard'
|
||||
end
|
||||
end
|
||||
|
||||
every 10.minutes do
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue