Edit country select in forms

app/controllers/admin/registrars_controller.rb

@@ -57,7 +57,7 @@ class Admin::RegistrarsController < AdminController
   def registrar_params
     params.require(:registrar).permit(
       :name, :reg_no, :vat_no, :address, :billing_address,
-      :country_id, :email, :phone, :billing_email
+      :country_code, :email, :phone, :billing_email
     )
   end
 end

app/controllers/admin/users_controller.rb

@@ -54,6 +54,6 @@ class Admin::UsersController < AdminController
   end
 
   def user_params
-    params.require(:user).permit(:username, :password, :identity_code, :email, :country_id, { roles: [] })
+    params.require(:user).permit(:username, :password, :identity_code, :email, :country_code, { roles: [] })
   end
 end

app/models/address.rb

@@ -55,7 +55,7 @@ class Address < ActiveRecord::Base
     def addr_hash_from_params(addr)
       return {} if addr.nil?
       return {} unless addr[:addr].is_a?(Hash)
-      { country_id: Country.find_by(iso: addr[:addr][:cc]).try(:id),
+      { country_code: Country.find_by(iso: addr[:addr][:cc]).try(:id),
         city: addr[:addr][:city],
         street: pretty_street(addr[:addr][:street]), # [0],
         # street2: addr[:addr][:street][1],

app/views/admin/registrars/_form.haml

@@ -27,8 +27,8 @@
 
     .col-md-6.text-left
       .form-group
-        = f.label :country_id
-        = f.select :country_id, options_for_select(Country.all.map{|x| [x.name, x.id]}, @registrar.country_id), {}, {class: 'form-control selectize'}
+        = f.label :country_code
+        = f.text_field :country_code, class: 'form-control'
       .form-group
         = f.label :address
         = f.text_field(:address, class: 'form-control')

app/views/admin/users/_form.haml

@@ -15,8 +15,8 @@
         = f.label :password
         = f.text_field(:password, class: 'form-control')
       .form-group
-        = f.label :country_id
-        = f.collection_select :country_id, Country.all, :id, :name, {}, { class: 'form-control selectize' }
+        = f.label :country_code
+        = f.text_field :country_code, class: 'form-control'
       .form-group
         = f.label :identity_code
         = f.text_field(:identity_code, class: 'form-control')