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

This commit is contained in:
Vladimir Krylov 2015-11-11 14:34:57 +02:00
commit 0040a3eb83
2 changed files with 2 additions and 2 deletions

View file

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

View file

@ -8,7 +8,7 @@
.row .row
.col-md-12= render 'admin/contacts/partials/statuses', contact: @contact .col-md-12= render 'admin/contacts/partials/statuses', contact: @contact
.row .row
.col-md-12= render 'admin/contacts/partials/domains' .col-md-12= render 'admin/contacts/partials/domains', contact: @contact
- if @contact.legal_documents.present? - if @contact.legal_documents.present?
.row .row