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

Updaded api user return data

Browse source
This commit is contained in:
Sergei Tsõganov 2022-07-07 13:45:20 +03:00
parent 363a9a7357
commit 7939c5065d
3 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/repp/v1/accounts_controller.rb
View file

@ -143,7 +143,7 @@ module Repp
arr = [] arr = []
users.each do |u| users.each do |u|
arr << { id: u.id, username: u.username, arr << { id: u.id, username: u.username,
role: u.roles.first } role: u.roles.first, registrar_name: u.registrar.name }
end end
arr arr

2
app/controllers/repp/v1/domains/admin_contacts_controller.rb
View file

@ -7,7 +7,7 @@ module Repp
unless @new_contact.identical_to?(@current_contact) unless @new_contact.identical_to?(@current_contact)
@epp_errors.add(:epp_errors, @epp_errors.add(:epp_errors,
msg: 'Admin contacts must be identical', msg: 'New and current admin contacts ident data must be identical',
code: '2304') code: '2304')
end end

1
app/models/api_user.rb
View file

@ -74,6 +74,7 @@ class ApiUser < User
self.class.where(identity_code: identity_code) self.class.where(identity_code: identity_code)
.where("identity_code IS NOT NULL AND identity_code != ''") .where("identity_code IS NOT NULL AND identity_code != ''")
.where.not(id: id) .where.not(id: id)
.includes(:registrar)
end end
def linked_with?(another_api_user) def linked_with?(another_api_user)