Merge pull request #492 from internetee/registry-475

Registry 475

app/views/admin/dns/zones/_zone.html.erb

@@ -1,7 +1,6 @@
 <tr>
-    <td><%= zone.origin %></td>
+    <td><%= link_to zone.origin, edit_admin_zone_path(zone), id: 'admin-edit-zone-btn' %></td>
     <td>
-        <%= 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' %>

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

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}"
+      zone = DNS::Zone.find_by!(origin: price.category)
-      p "Price category: #{price.category}"
-      zone = DNS::Zone.find_by!(origin: price.category.strip)
       price.zone = zone
       price.save!
     end

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