Do not allow to permanently remove a zone

#522
This commit is contained in:
Artur Beljajev 2017-05-23 17:23:05 +03:00
parent 64f6e07a20
commit 35267820f9
6 changed files with 2 additions and 58 deletions

View file

@ -36,12 +36,6 @@ module Admin
end end
end end
def destroy
@zone.destroy!
flash[:notice] = t('.destroyed')
redirect_to_index
end
private private
def load_zone def load_zone

View file

@ -3,18 +3,7 @@
</ol> </ol>
<div class="page-header"> <div class="page-header">
<div class="row">
<div class="col-sm-10">
<h1><%= t '.title' %></h1> <h1><%= t '.title' %></h1>
</div>
<div class="col-sm-2 text-right">
<%= link_to(t('.delete_btn'), admin_zone_path(@zone),
method: :delete,
data: { confirm: t('.delete_btn_confirm') },
class: 'btn btn-danger') %>
</div>
</div>
</div> </div>
<%= render 'form', zone: @zone %> <%= render 'form', zone: @zone %>

View file

@ -15,15 +15,10 @@ en:
edit: edit:
title: Edit zone title: Edit zone
delete_btn: Delete
delete_btn_confirm: Are you sure you want to delete zone?
update: update:
updated: Zone has been updated updated: Zone has been updated
destroy:
destroyed: Zone has been deleted
form: form:
create_btn: Create zone create_btn: Create zone
update_btn: Update zone update_btn: Update zone

View file

@ -163,7 +163,7 @@ Rails.application.routes.draw do
namespace :admin do namespace :admin do
resources :keyrelays resources :keyrelays
resources :zonefiles resources :zonefiles
resources :zones, controller: 'dns/zones', except: %i[show] resources :zones, controller: 'dns/zones', except: %i[show destroy]
resources :legal_documents resources :legal_documents
resources :keyrelays resources :keyrelays
resources :prices, controller: 'billing/prices', except: %i[show] resources :prices, controller: 'billing/prices', except: %i[show]

View file

@ -1,16 +0,0 @@
require 'rails_helper'
RSpec.feature 'Deleting zone in admin area', settings: false do
given!(:zone) { create(:zone) }
background do
sign_in_to_admin_area
end
scenario 'deletes zone' do
visit edit_admin_zone_url(zone)
click_link_or_button t('admin.dns.zones.edit.delete_btn')
expect(page).to have_text(t('admin.dns.zones.destroy.destroyed'))
end
end

View file

@ -1,18 +0,0 @@
require 'rails_helper'
RSpec.describe 'admin zone destroy', settings: false do
let!(:zone) { create(:zone) }
before :example do
sign_in_to_admin_area
end
it 'deletes zone' do
expect { delete admin_zone_path(zone) }.to change { DNS::Zone.count }.from(1).to(0)
end
it 'redirects to :index' do
delete admin_zone_path(zone)
expect(response).to redirect_to admin_zones_url
end
end