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

Merge branch 'story/105314040-show-all-contact-domains' into staging

Browse source
This commit is contained in:
Vladimir Krylov 2015-11-06 11:58:41 +02:00
commit a7d7304664
3 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,4 @@
- domains = @contact.all_domains(page: params[:domain_page], per: 20, params: params)
- domains = (contact || @contact).all_domains(page: params[:domain_page], per: 20, params: params)
#contacts.panel.panel-default
.panel-heading
.pull-left

4
app/views/admin/contacts/show.haml
View file

@ -5,10 +5,10 @@
.row
.col-md-6= render 'admin/contacts/partials/general'
.col-md-6= render 'admin/contacts/partials/address'
.row
.col-md-12= render 'admin/contacts/partials/domains'
.row
.col-md-12= render 'admin/contacts/partials/statuses', contact: @contact
.row
.col-md-12= render 'admin/contacts/partials/domains'
- if @contact.legal_documents.present?
.row

2
app/views/registrar/contacts/show.haml
View file

@ -9,6 +9,8 @@
.col-md-6= render 'registrar/contacts/partials/address'
.row
.col-md-12= render 'registrar/contacts/partials/statuses', statuses: @contact.statuses
.row
.col-md-12= render 'admin/contacts/partials/domains', contact: Contact.find_by(code: params[:id])
- else
.row