Merge branch 'master' into registry-927

This commit is contained in:
Maciej Szlosarczyk 2018-08-27 11:40:28 +03:00
commit 8aa8aea24e
No known key found for this signature in database
GPG key ID: 41D62D42D3B0D765
99 changed files with 712 additions and 536 deletions

View file

@ -16,12 +16,12 @@ module Api
status: :bad_request) && return
end
@domains = associated_domains(current_user).limit(limit).offset(offset)
@domains = associated_domains(current_registrant_user).limit(limit).offset(offset)
render json: @domains
end
def show
domain_pool = associated_domains(current_user)
domain_pool = associated_domains(current_registrant_user)
@domain = domain_pool.find_by(uuid: params[:uuid])
if @domain