From db884e82db215eebd6599764556518a5e94ca680 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Fri, 28 Apr 2017 13:59:39 +0300 Subject: [PATCH 1/2] Revert "Debug migration" This reverts commit 6d2bd0217d33bbc8bdba3e7c3eff14e626e201b6. --- db/migrate/20170423225333_add_zone_to_prices.rb | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/db/migrate/20170423225333_add_zone_to_prices.rb b/db/migrate/20170423225333_add_zone_to_prices.rb index 6a5762b5f..cf866cb97 100644 --- a/db/migrate/20170423225333_add_zone_to_prices.rb +++ b/db/migrate/20170423225333_add_zone_to_prices.rb @@ -14,14 +14,8 @@ class AddZoneToPrices < ActiveRecord::Migration private def assign_zone_to_current_prices - p "Categories: #{Billing::Price.pluck(:category).uniq.sort}" - p "Zone origins: #{DNS::Zone.origins.sort}" - p 'Converting...' - Billing::Price.all.each do |price| - p "Price: #{price.attributes}" - p "Price category: #{price.category}" - zone = DNS::Zone.find_by!(origin: price.category.strip) + zone = DNS::Zone.find_by!(origin: price.category) price.zone = zone price.save! end From b67f2f1e971bbc0e387f1981984f07114f07e8ea Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Fri, 28 Apr 2017 19:56:14 +0300 Subject: [PATCH 2/2] Improve zone list UI #475 --- app/views/admin/dns/zones/_zone.html.erb | 3 +-- config/locales/admin/dns/zones.en.yml | 1 - spec/features/admin/dns/zones/edit_spec.rb | 4 ++-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/app/views/admin/dns/zones/_zone.html.erb b/app/views/admin/dns/zones/_zone.html.erb index 3a2d782d4..5f13fdf3a 100644 --- a/app/views/admin/dns/zones/_zone.html.erb +++ b/app/views/admin/dns/zones/_zone.html.erb @@ -1,7 +1,6 @@ - <%= zone.origin %> + <%= link_to zone.origin, edit_admin_zone_path(zone), id: 'admin-edit-zone-btn' %> - <%= link_to t('.edit_btn'), edit_admin_zone_path(zone), class: 'btn btn-xs btn-primary' %> <%= link_to t('.generate_zone_file_btn'), admin_zonefiles_path(origin: zone.origin), method: 'post', class: 'btn btn-xs btn-primary' %> diff --git a/config/locales/admin/dns/zones.en.yml b/config/locales/admin/dns/zones.en.yml index c6fd4093b..08897a93b 100644 --- a/config/locales/admin/dns/zones.en.yml +++ b/config/locales/admin/dns/zones.en.yml @@ -29,5 +29,4 @@ en: update_btn: Update zone zone: - edit_btn: Edit generate_zone_file_btn: Generate zone file diff --git a/spec/features/admin/dns/zones/edit_spec.rb b/spec/features/admin/dns/zones/edit_spec.rb index caf3fcfc2..d21f358ec 100644 --- a/spec/features/admin/dns/zones/edit_spec.rb +++ b/spec/features/admin/dns/zones/edit_spec.rb @@ -8,7 +8,7 @@ RSpec.feature 'Editing zone in admin area', settings: false do end scenario 'updates zone' do - open_list + visit admin_zones_url open_form submit_form @@ -20,7 +20,7 @@ RSpec.feature 'Editing zone in admin area', settings: false do end def open_form - click_link_or_button t('admin.dns.zones.zone.edit_btn') + click_link_or_button 'admin-edit-zone-btn' end def submit_form