Merge branch 'master' into improve-registrant-area

This commit is contained in:
Artur Beljajev 2018-08-27 12:23:09 +03:00
commit d27443277f
111 changed files with 947 additions and 705 deletions

View file

@ -4,7 +4,6 @@ class Registrant::ContactsController < RegistrantController
def show
@contact = Contact.where(id: contacts).find_by(id: params[:id])
@current_user = current_user
authorize! :read, @contact
end
@ -23,7 +22,7 @@ class Registrant::ContactsController < RegistrantController
def domain_ids
@domain_ids ||= begin
ident_cc, ident = @current_user.registrant_ident.to_s.split '-'
ident_cc, ident = current_registrant_user.registrant_ident.to_s.split '-'
BusinessRegistryCache.fetch_by_ident_and_cc(ident, ident_cc).associated_domain_ids
end
end