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

Fixed the admin-part of contact address

Browse source
This commit is contained in:
Andres Keskküla 2014-09-25 16:44:44 +03:00
parent 31e92df6f6
commit 7ec06a4ade
8 changed files with 33 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/controllers/admin/contacts_controller.rb
View file

@ -9,8 +9,7 @@ class Admin::ContactsController < ApplicationController
def new
@contact = Contact.new
@contact.build_local_address
@contact.build_international_address
@contact.build_address
end
def create
@ -56,8 +55,7 @@ class Admin::ContactsController < ApplicationController
end
def contact_params
params.require(:contact).permit( :email, :phone, :fax, :ident_type, :ident, :auth_info,
local_address_attributes: [:city, :street, :zip, :street2, :street3, :name, :org_name, :country_id],
international_address_attributes: [:city, :street, :zip, :street2, :street3, :name, :org_name, :country_id])
params.require(:contact).permit( :email, :phone, :fax, :ident_type, :ident, :auth_info, :name, :org_name,
address_attributes: [:city, :street, :zip, :street2, :street3, :country_id])
end
end

43
app/views/admin/contacts/_form.haml
View file

@ -8,16 +8,19 @@
.row
.col-md-6.text-left
%h3
Contact
.form-group
= f.label :name
= f.text_field(:name, class: 'form-control')
= f.label :email
= f.text_field(:email, class: 'form-control')
= f.label :phone
= f.text_field(:phone, class: 'form-control')
= f.label :fax
= f.text_field(:fax, class: 'form-control')
.col-md-6.text-left
.form-group
= f.label :org_name
= f.text_field(:org_name, class: 'form-control')
= f.label :ident_type
= f.select :ident_type, options_for_select(Contact::IDENT_TYPES, @contact.ident_type), {}, {class: 'form-control'}
= f.label :ident
@ -25,18 +28,11 @@
= f.label :auth_info
= f.text_field(:auth_info, class: 'form-control')
%hr
.row
.col-md-6.text-left
%h3
International Address
Address
.form-group
= f.fields_for :international_address do |ia|
= ia.label :name
= ia.text_field(:name, class: 'form-control')
= ia.label :org_name
= ia.text_field(:org_name, class: 'form-control')
= f.fields_for :address do |ia|
= ia.label :country_id, t(:country)
= ia.collection_select :country_id, Country.all, :id, :name,{}, { class: 'form-control' }
@ -50,28 +46,7 @@
= ia.text_field(:street2, class: 'form-control')
.col-md-6.text-left
%h3
Local Address
= f.fields_for :local_address do |ia|
= ia.label :name
= ia.text_field(:name, class: 'form-control')
= ia.label :country_id, t(:country)
= ia.collection_select :country_id, Country.all, :id, :name,{}, { class: 'form-control' }
= ia.label :org_name
= ia.text_field(:org_name, class: 'form-control')
= ia.label :city
= ia.text_field(:city, class: 'form-control')
= ia.label :street
= ia.text_field(:street, class: 'form-control')
= ia.label :street2
= ia.text_field(:street2, class: 'form-control')
= ia.label :street3
= ia.text_field(:street2, class: 'form-control')
%hr
.row
.col-md-12.text-right
= button_tag(t('shared.save'), class: 'btn btn-primary')

2
app/views/admin/contacts/index.haml
View file

@ -13,7 +13,7 @@
%thead
%tr
%th{class: 'col-xs-2'}
= sort_link(@q, 'international_address_name', t('shared.name'))
= sort_link(@q, 'name', t('shared.name'))
%th{class: 'col-xs-2'}
= sort_link(@q, 'code', t('shared.code'))
%th{class: 'col-xs-2'}

20
app/views/admin/contacts/partials/_address.haml
View file

@ -4,16 +4,24 @@
.panel-body
%dl.dl-horizontal
%dt= t('shared.country')
%dd= @contact.address_country
%dd= @contact.address.country
%dt= t('shared.city')
%dd= @contact.address_city
%dd= @contact.address.city
%dt= t('shared.street')
%dd= @contact.address_street
%dd= @contact.address.street
- if @contact.address.street2
%dt= t('shared.street')
%dd= @contact.address.street2
- if @contact.address.street3
%dt= t('shared.street')
%dd= @contact.address.street3
%dt= t('shared.zip')
%dd= @contact.address_zip
%dd= @contact.address.zip
%dt= t('shared.org_name')
%dd= @contact.address_org_name

3
app/views/admin/contacts/partials/_general.haml
View file

@ -6,6 +6,9 @@
%dt= t('shared.name')
%dd= @contact.name
%dt= t('shared.org_name')
%dd= @contact.org_name
%dt= t('shared.code')
%dd= @contact.code

2
app/views/admin/contacts/partials/_search.haml
View file

@ -1,5 +1,5 @@
= search_form_for [:admin, @q] do |f|
= f.search_field :international_address_name_cont
= f.search_field :name_cont
= f.submit do
%span.glyphicon.glyphicon-search

2
app/views/admin/domains/index.haml
View file

@ -16,7 +16,7 @@
%th{class: 'col-xs-2'}
= sort_link(@q, 'registrar_name', t('shared.registrar'))
%th{class: 'col-xs-2'}
= sort_link(@q, 'owner_contact_international_address_name', t('shared.owner'))
= sort_link(@q, 'owner_contact_name', t('shared.owner'))
%th{class: 'col-xs-1'}
= sort_link(@q, 'valid_to', t('shared.valid_to'))
%th{class: 'col-xs-1'}

2
app/views/client/domains/index.haml
View file

@ -11,7 +11,7 @@
%th{class: 'col-xs-2'}
= sort_link(@q, 'name')
%th{class: 'col-xs-2'}
= sort_link(@q, 'owner_contact_international_address_name', t('shared.owner'))
= sort_link(@q, 'owner_contact_name', t('shared.owner'))
%th{class: 'col-xs-1'}
= sort_link(@q, 'valid_to', t('shared.valid_to'))
%th{class: 'col-xs-1'}