zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-05-18 10:19:45 +02:00
Code Issues Projects Releases Packages Wiki Activity

Edit country select in forms

Browse source
This commit is contained in:
Martin Lensment 2015-02-02 11:51:22 +02:00
parent 7537bb3712
commit 195aa4a890
7 changed files with 147 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/admin/registrars_controller.rb
View file

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

2
app/controllers/admin/users_controller.rb
View file

@ -54,6 +54,6 @@ class Admin::UsersController < AdminController
end end
def user_params 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
end end

2
app/models/address.rb
View file

@ -55,7 +55,7 @@ class Address < ActiveRecord::Base
def addr_hash_from_params(addr) def addr_hash_from_params(addr)
return {} if addr.nil? return {} if addr.nil?
return {} unless addr[:addr].is_a?(Hash) 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], city: addr[:addr][:city],
street: pretty_street(addr[:addr][:street]), # [0], street: pretty_street(addr[:addr][:street]), # [0],
# street2: addr[:addr][:street][1], # street2: addr[:addr][:street][1],

4
app/views/admin/registrars/_form.haml
View file

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

4
app/views/admin/users/_form.haml
View file

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

231
db/schema.rb
View file

@ -11,19 +11,25 @@
# #
# It's strongly recommended that you check this file into your version control system. # It's strongly recommended that you check this file into your version control system.
<<<<<<< HEAD
ActiveRecord::Schema.define(version: 20150202084444) do ActiveRecord::Schema.define(version: 20150202084444) do
=======
ActiveRecord::Schema.define(version: 20150130191056) do
>>>>>>> c010000bfec582db543f6a89f263e92b7611c7ef
# These are extensions that must be enabled in order to support this database # These are extensions that must be enabled in order to support this database
enable_extension "plpgsql" enable_extension "plpgsql"
create_table "address_versions", force: :cascade do |t|
t.string "item_type", limit: 255, null: false
t.integer "item_id", null: false
t.string "event", limit: 255, null: false
t.string "whodunnit", limit: 255
t.text "object"
t.datetime "created_at"
end
add_index "address_versions", ["item_type", "item_id"], name: "index_address_versions_on_item_type_and_item_id", using: :btree
create_table "addresses", force: :cascade do |t| create_table "addresses", force: :cascade do |t|
t.integer "contact_id" t.integer "contact_id"
t.integer "country_id" t.integer "country_id"
<<<<<<< HEAD
t.string "city", limit: 255 t.string "city", limit: 255
t.string "street", limit: 255 t.string "street", limit: 255
t.string "zip", limit: 255 t.string "zip", limit: 255
@ -32,24 +38,15 @@ ActiveRecord::Schema.define(version: 20150130191056) do
t.string "street2", limit: 255 t.string "street2", limit: 255
t.string "street3", limit: 255 t.string "street3", limit: 255
t.string "country_code" t.string "country_code"
=======
t.string "city"
t.string "street"
t.string "zip"
t.datetime "created_at"
t.datetime "updated_at"
t.string "street2"
t.string "street3"
t.string "creator_str" t.string "creator_str"
t.string "updator_str" t.string "updator_str"
>>>>>>> c010000bfec582db543f6a89f263e92b7611c7ef
end end
create_table "api_users", force: :cascade do |t| create_table "api_users", force: :cascade do |t|
t.integer "registrar_id" t.integer "registrar_id"
t.string "username" t.string "username", limit: 255
t.string "password" t.string "password", limit: 255
t.boolean "active", default: false t.boolean "active", default: false
t.text "csr" t.text "csr"
t.text "crt" t.text "crt"
t.datetime "created_at" t.datetime "created_at"
@ -81,8 +78,8 @@ ActiveRecord::Schema.define(version: 20150130191056) do
end end
create_table "contact_statuses", force: :cascade do |t| create_table "contact_statuses", force: :cascade do |t|
t.string "value" t.string "value", limit: 255
t.string "description" t.string "description", limit: 255
t.integer "contact_id" t.integer "contact_id"
t.datetime "created_at" t.datetime "created_at"
t.datetime "updated_at" t.datetime "updated_at"
@ -90,30 +87,41 @@ ActiveRecord::Schema.define(version: 20150130191056) do
t.string "updator_str" t.string "updator_str"
end end
create_table "contact_versions", force: :cascade do |t|
t.string "item_type", limit: 255, null: false
t.integer "item_id", null: false
t.string "event", limit: 255, null: false
t.string "whodunnit", limit: 255
t.text "object"
t.datetime "created_at"
end
add_index "contact_versions", ["item_type", "item_id"], name: "index_contact_versions_on_item_type_and_item_id", using: :btree
create_table "contacts", force: :cascade do |t| create_table "contacts", force: :cascade do |t|
t.string "code" t.string "code", limit: 255
t.string "type" t.string "type", limit: 255
t.string "reg_no" t.string "reg_no", limit: 255
t.string "phone" t.string "phone", limit: 255
t.string "email" t.string "email", limit: 255
t.string "fax" t.string "fax", limit: 255
t.datetime "created_at" t.datetime "created_at"
t.datetime "updated_at" t.datetime "updated_at"
t.string "ident" t.string "ident", limit: 255
t.string "ident_type" t.string "ident_type", limit: 255
t.integer "created_by_id" t.integer "created_by_id"
t.integer "updated_by_id" t.integer "updated_by_id"
t.string "auth_info" t.string "auth_info", limit: 255
t.string "name" t.string "name", limit: 255
t.string "org_name" t.string "org_name", limit: 255
t.integer "registrar_id" t.integer "registrar_id"
t.string "creator_str" t.string "creator_str"
t.string "updator_str" t.string "updator_str"
end end
create_table "countries", force: :cascade do |t| create_table "countries", force: :cascade do |t|
t.string "iso" t.string "iso", limit: 255
t.string "name" t.string "name", limit: 255
t.datetime "created_at" t.datetime "created_at"
t.datetime "updated_at" t.datetime "updated_at"
t.string "creator_str" t.string "creator_str"
@ -121,15 +129,15 @@ ActiveRecord::Schema.define(version: 20150130191056) do
end end
create_table "delayed_jobs", force: :cascade do |t| create_table "delayed_jobs", force: :cascade do |t|
t.integer "priority", default: 0, null: false t.integer "priority", default: 0, null: false
t.integer "attempts", default: 0, null: false t.integer "attempts", default: 0, null: false
t.text "handler", null: false t.text "handler", null: false
t.text "last_error" t.text "last_error"
t.datetime "run_at" t.datetime "run_at"
t.datetime "locked_at" t.datetime "locked_at"
t.datetime "failed_at" t.datetime "failed_at"
t.string "locked_by" t.string "locked_by", limit: 255
t.string "queue" t.string "queue", limit: 255
t.datetime "created_at" t.datetime "created_at"
t.datetime "updated_at" t.datetime "updated_at"
end end
@ -138,16 +146,25 @@ ActiveRecord::Schema.define(version: 20150130191056) do
create_table "delegation_signers", force: :cascade do |t| create_table "delegation_signers", force: :cascade do |t|
t.integer "domain_id" t.integer "domain_id"
t.string "key_tag" t.string "key_tag", limit: 255
t.integer "alg" t.integer "alg"
t.integer "digest_type" t.integer "digest_type"
t.string "digest" t.string "digest", limit: 255
end end
create_table "depricated_versions", force: :cascade do |t| create_table "depricated_versions", force: :cascade do |t|
t.string "item_type", limit: 255, null: false
t.integer "item_id", null: false
t.string "event", limit: 255, null: false
t.string "whodunnit", limit: 255
t.text "object"
t.datetime "created_at" t.datetime "created_at"
t.integer "transaction_id"
end end
add_index "depricated_versions", ["item_type", "item_id"], name: "index_depricated_versions_on_item_type_and_item_id", using: :btree
add_index "depricated_versions", ["transaction_id"], name: "index_depricated_versions_on_transaction_id", using: :btree
create_table "dnskeys", force: :cascade do |t| create_table "dnskeys", force: :cascade do |t|
t.integer "domain_id" t.integer "domain_id"
t.integer "flags" t.integer "flags"
@ -155,10 +172,10 @@ ActiveRecord::Schema.define(version: 20150130191056) do
t.integer "alg" t.integer "alg"
t.text "public_key" t.text "public_key"
t.integer "delegation_signer_id" t.integer "delegation_signer_id"
t.string "ds_key_tag" t.string "ds_key_tag", limit: 255
t.integer "ds_alg" t.integer "ds_alg"
t.integer "ds_digest_type" t.integer "ds_digest_type"
t.string "ds_digest" t.string "ds_digest", limit: 255
t.string "creator_str" t.string "creator_str"
t.string "updator_str" t.string "updator_str"
end end
@ -166,25 +183,36 @@ ActiveRecord::Schema.define(version: 20150130191056) do
create_table "domain_contacts", force: :cascade do |t| create_table "domain_contacts", force: :cascade do |t|
t.integer "contact_id" t.integer "contact_id"
t.integer "domain_id" t.integer "domain_id"
t.string "contact_type" t.string "contact_type", limit: 255
t.datetime "created_at" t.datetime "created_at"
t.datetime "updated_at" t.datetime "updated_at"
t.string "contact_code_cache" t.string "contact_code_cache", limit: 255
t.string "creator_str" t.string "creator_str"
t.string "updator_str" t.string "updator_str"
end end
create_table "domain_status_versions", force: :cascade do |t|
t.string "item_type", limit: 255, null: false
t.integer "item_id", null: false
t.string "event", limit: 255, null: false
t.string "whodunnit", limit: 255
t.text "object"
t.datetime "created_at"
end
add_index "domain_status_versions", ["item_type", "item_id"], name: "index_domain_status_versions_on_item_type_and_item_id", using: :btree
create_table "domain_statuses", force: :cascade do |t| create_table "domain_statuses", force: :cascade do |t|
t.integer "domain_id" t.integer "domain_id"
t.string "description" t.string "description", limit: 255
t.string "value" t.string "value", limit: 255
t.string "creator_str" t.string "creator_str"
t.string "updator_str" t.string "updator_str"
end end
create_table "domain_transfers", force: :cascade do |t| create_table "domain_transfers", force: :cascade do |t|
t.integer "domain_id" t.integer "domain_id"
t.string "status" t.string "status", limit: 255
t.datetime "transfer_requested_at" t.datetime "transfer_requested_at"
t.datetime "transferred_at" t.datetime "transferred_at"
t.integer "transfer_from_id" t.integer "transfer_from_id"
@ -196,34 +224,39 @@ ActiveRecord::Schema.define(version: 20150130191056) do
t.string "updator_str" t.string "updator_str"
end end
create_table "domain_versions", force: :cascade do |t|
t.string "item_type", limit: 255, null: false
t.integer "item_id", null: false
t.string "event", limit: 255, null: false
t.string "whodunnit", limit: 255
t.text "object"
t.datetime "created_at"
t.text "snapshot"
end
add_index "domain_versions", ["item_type", "item_id"], name: "index_domain_versions_on_item_type_and_item_id", using: :btree
create_table "domains", force: :cascade do |t| create_table "domains", force: :cascade do |t|
t.string "name" t.string "name", limit: 255
t.integer "registrar_id" t.integer "registrar_id"
t.datetime "registered_at" t.datetime "registered_at"
<<<<<<< HEAD
=======
t.string "status"
>>>>>>> c010000bfec582db543f6a89f263e92b7611c7ef
t.datetime "valid_from" t.datetime "valid_from"
t.datetime "valid_to" t.datetime "valid_to"
t.integer "owner_contact_id" t.integer "owner_contact_id"
t.string "auth_info" t.string "auth_info", limit: 255
t.datetime "created_at" t.datetime "created_at"
t.datetime "updated_at" t.datetime "updated_at"
t.string "name_dirty" t.string "name_dirty", limit: 255
t.string "name_puny" t.string "name_puny", limit: 255
t.integer "period" t.integer "period"
t.string "period_unit", limit: 1 t.string "period_unit", limit: 1
<<<<<<< HEAD
t.string "status" t.string "status"
=======
t.string "creator_str" t.string "creator_str"
t.string "updator_str" t.string "updator_str"
>>>>>>> c010000bfec582db543f6a89f263e92b7611c7ef
end end
create_table "epp_sessions", force: :cascade do |t| create_table "epp_sessions", force: :cascade do |t|
t.string "session_id" t.string "session_id", limit: 255
t.text "data" t.text "data"
t.datetime "created_at" t.datetime "created_at"
t.datetime "updated_at" t.datetime "updated_at"
@ -235,12 +268,12 @@ ActiveRecord::Schema.define(version: 20150130191056) do
create_table "keyrelays", force: :cascade do |t| create_table "keyrelays", force: :cascade do |t|
t.integer "domain_id" t.integer "domain_id"
t.datetime "pa_date" t.datetime "pa_date"
t.string "key_data_flags" t.string "key_data_flags", limit: 255
t.string "key_data_protocol" t.string "key_data_protocol", limit: 255
t.string "key_data_alg" t.string "key_data_alg", limit: 255
t.text "key_data_public_key" t.text "key_data_public_key"
t.string "auth_info_pw" t.string "auth_info_pw", limit: 255
t.string "expiry_relative" t.string "expiry_relative", limit: 255
t.datetime "expiry_absolute" t.datetime "expiry_absolute"
t.integer "requester_id" t.integer "requester_id"
t.integer "accepter_id" t.integer "accepter_id"
@ -251,10 +284,10 @@ ActiveRecord::Schema.define(version: 20150130191056) do
end end
create_table "legal_documents", force: :cascade do |t| create_table "legal_documents", force: :cascade do |t|
t.string "document_type" t.string "document_type", limit: 255
t.text "body" t.text "body"
t.integer "documentable_id" t.integer "documentable_id"
t.string "documentable_type" t.string "documentable_type", limit: 255
t.datetime "created_at" t.datetime "created_at"
t.datetime "updated_at" t.datetime "updated_at"
t.string "creator_str" t.string "creator_str"
@ -566,9 +599,9 @@ ActiveRecord::Schema.define(version: 20150130191056) do
create_table "messages", force: :cascade do |t| create_table "messages", force: :cascade do |t|
t.integer "registrar_id" t.integer "registrar_id"
t.string "body" t.string "body", limit: 255
t.string "attached_obj_type" t.string "attached_obj_type", limit: 255
t.string "attached_obj_id" t.string "attached_obj_id", limit: 255
t.boolean "queued" t.boolean "queued"
t.datetime "created_at" t.datetime "created_at"
t.datetime "updated_at" t.datetime "updated_at"
@ -576,36 +609,47 @@ ActiveRecord::Schema.define(version: 20150130191056) do
t.string "updator_str" t.string "updator_str"
end end
create_table "nameserver_versions", force: :cascade do |t|
t.string "item_type", limit: 255, null: false
t.integer "item_id", null: false
t.string "event", limit: 255, null: false
t.string "whodunnit", limit: 255
t.text "object"
t.datetime "created_at"
end
add_index "nameserver_versions", ["item_type", "item_id"], name: "index_nameserver_versions_on_item_type_and_item_id", using: :btree
create_table "nameservers", force: :cascade do |t| create_table "nameservers", force: :cascade do |t|
t.string "hostname" t.string "hostname", limit: 255
t.string "ipv4" t.string "ipv4", limit: 255
t.datetime "created_at" t.datetime "created_at"
t.datetime "updated_at" t.datetime "updated_at"
t.string "ipv6" t.string "ipv6", limit: 255
t.integer "domain_id" t.integer "domain_id"
t.string "creator_str" t.string "creator_str"
t.string "updator_str" t.string "updator_str"
end end
create_table "registrars", force: :cascade do |t| create_table "registrars", force: :cascade do |t|
t.string "name" t.string "name", limit: 255
t.string "reg_no" t.string "reg_no", limit: 255
t.string "vat_no" t.string "vat_no", limit: 255
t.string "address" t.string "address", limit: 255
t.integer "country_id" t.integer "country_id"
t.string "billing_address" t.string "billing_address", limit: 255
t.datetime "created_at" t.datetime "created_at"
t.datetime "updated_at" t.datetime "updated_at"
t.string "creator_str"
t.string "updator_str"
t.string "phone" t.string "phone"
t.string "email" t.string "email"
t.string "billing_email" t.string "billing_email"
t.string "country_code" t.string "country_code"
t.string "creator_str"
t.string "updator_str"
end end
create_table "reserved_domains", force: :cascade do |t| create_table "reserved_domains", force: :cascade do |t|
t.string "name" t.string "name", limit: 255
t.datetime "created_at" t.datetime "created_at"
t.datetime "updated_at" t.datetime "updated_at"
t.string "creator_str" t.string "creator_str"
@ -613,7 +657,7 @@ ActiveRecord::Schema.define(version: 20150130191056) do
end end
create_table "settings", force: :cascade do |t| create_table "settings", force: :cascade do |t|
t.string "var", null: false t.string "var", limit: 255, null: false
t.text "value" t.text "value"
t.integer "thing_id" t.integer "thing_id"
t.string "thing_type", limit: 30 t.string "thing_type", limit: 30
@ -626,47 +670,46 @@ ActiveRecord::Schema.define(version: 20150130191056) do
add_index "settings", ["thing_type", "thing_id", "var"], name: "index_settings_on_thing_type_and_thing_id_and_var", unique: true, using: :btree add_index "settings", ["thing_type", "thing_id", "var"], name: "index_settings_on_thing_type_and_thing_id_and_var", unique: true, using: :btree
create_table "users", force: :cascade do |t| create_table "users", force: :cascade do |t|
t.string "username" t.string "username", limit: 255
t.string "password" t.string "password", limit: 255
t.datetime "created_at" t.datetime "created_at"
t.datetime "updated_at" t.datetime "updated_at"
t.string "email" t.string "email", limit: 255
t.integer "sign_in_count", default: 0, null: false t.integer "sign_in_count", default: 0, null: false
t.datetime "current_sign_in_at" t.datetime "current_sign_in_at"
t.datetime "last_sign_in_at" t.datetime "last_sign_in_at"
t.inet "current_sign_in_ip" t.inet "current_sign_in_ip"
t.inet "last_sign_in_ip" t.inet "last_sign_in_ip"
t.string "identity_code" t.string "identity_code", limit: 255
t.integer "country_id" t.integer "country_id"
<<<<<<< HEAD
t.string "roles", array: true t.string "roles", array: true
t.string "country_code" t.string "country_code"
t.string "creator_str"
t.string "updator_str"
end end
create_table "version_associations", force: :cascade do |t| create_table "version_associations", force: :cascade do |t|
t.integer "version_id" t.integer "version_id"
t.string "foreign_key_name", null: false t.string "foreign_key_name", null: false
t.integer "foreign_key_id" t.integer "foreign_key_id"
=======
t.string "roles", array: true
t.string "creator_str"
t.string "updator_str"
>>>>>>> c010000bfec582db543f6a89f263e92b7611c7ef
end end
add_index "version_associations", ["foreign_key_name", "foreign_key_id"], name: "index_version_associations_on_foreign_key", using: :btree
add_index "version_associations", ["version_id"], name: "index_version_associations_on_version_id", using: :btree
create_table "versions", force: :cascade do |t| create_table "versions", force: :cascade do |t|
t.text "depricated_table_but_somehow_paper_trail_tests_fails_without_it" t.text "depricated_table_but_somehow_paper_trail_tests_fails_without_it"
end end
create_table "zonefile_settings", force: :cascade do |t| create_table "zonefile_settings", force: :cascade do |t|
t.string "origin" t.string "origin", limit: 255
t.integer "ttl" t.integer "ttl"
t.integer "refresh" t.integer "refresh"
t.integer "retry" t.integer "retry"
t.integer "expire" t.integer "expire"
t.integer "minimum_ttl" t.integer "minimum_ttl"
t.string "email" t.string "email", limit: 255
t.string "master_nameserver" t.string "master_nameserver", limit: 255
t.datetime "created_at" t.datetime "created_at"
t.datetime "updated_at" t.datetime "updated_at"
t.string "creator_str" t.string "creator_str"