diff --git a/server/src/uds/REST/methods/services_usage.py b/server/src/uds/REST/methods/services_usage.py index db346e57..40364bed 100644 --- a/server/src/uds/REST/methods/services_usage.py +++ b/server/src/uds/REST/methods/services_usage.py @@ -70,7 +70,7 @@ class ServicesUsage(DetailHandler): 'user_id': '' } else: - owner = item.user.fullUsername + owner = item.user.pretty_name owner_info = { 'auth_id': item.user.manager.uuid, 'user_id': item.user.uuid diff --git a/server/src/uds/REST/methods/user_services.py b/server/src/uds/REST/methods/user_services.py index 159a6131..1711f98c 100644 --- a/server/src/uds/REST/methods/user_services.py +++ b/server/src/uds/REST/methods/user_services.py @@ -91,7 +91,7 @@ class AssignedService(DetailHandler): 'user_id': '' } else: - owner = item.user.fullUsername + owner = item.user.pretty_name owner_info = { 'auth_id': item.user.manager.uuid, 'user_id': item.user.uuid diff --git a/server/src/uds/models/User.py b/server/src/uds/models/User.py index d8d6deb6..de3298ca 100644 --- a/server/src/uds/models/User.py +++ b/server/src/uds/models/User.py @@ -88,6 +88,10 @@ class User(UUIDModel): ''' return self.getManager().getForAuth(self.name) + @property + def pretty_name(self): + return self.name + '@' + self.manager.name + def getManager(self): ''' Returns the authenticator object that owns this user. @@ -168,10 +172,6 @@ class User(UUIDModel): # This group matches yield g - @property - def fullUsername(self): - return self.manager.name + "\\" + self.name - def __str__(self): return u"User {0}(id:{1}) from auth {2}".format(self.name, self.id, self.manager.name) diff --git a/server/src/uds/static/adm/js/gui-d-services.coffee b/server/src/uds/static/adm/js/gui-d-services.coffee index 8572b264..20de799f 100644 --- a/server/src/uds/static/adm/js/gui-d-services.coffee +++ b/server/src/uds/static/adm/js/gui-d-services.coffee @@ -226,7 +226,7 @@ gui.providers.link = (event) -> onData: (data) -> $.each data, (index, value) -> - value.owner = gui.fastLink(value.owner, "#{value.owner_info.auth_id},u#{value.owner_info.user_id}", 'gui.providers.fastLink', 'goAuthLink') + value.owner = gui.fastLink(value.owner.replace /@/, '@', "#{value.owner_info.auth_id},u#{value.owner_info.user_id}", 'gui.providers.fastLink', 'goAuthLink') value.pool = gui.fastLink(value.pool, value.pool_id, 'gui.providers.fastLink', 'goPoolLink') buttons: [ diff --git a/server/src/uds/static/adm/js/gui-d-servicespools.coffee b/server/src/uds/static/adm/js/gui-d-servicespools.coffee index 35c2d8bb..c9888b56 100644 --- a/server/src/uds/static/adm/js/gui-d-servicespools.coffee +++ b/server/src/uds/static/adm/js/gui-d-servicespools.coffee @@ -360,7 +360,7 @@ gui.servicesPools.link = (event) -> onData: (data) -> $.each data, (undefined_, value) -> - value.group_name = gui.fastLink("#{value.auth_name}\\#{value.name}", "#{value.auth_id},g#{value.id}", 'gui.servicesPools.fastLink', 'goAuthLink') + value.group_name = gui.fastLink("#{value.name}@#{value.auth_name}", "#{value.auth_id},g#{value.id}", 'gui.servicesPools.fastLink', 'goAuthLink') return return @@ -407,7 +407,7 @@ gui.servicesPools.link = (event) -> value.in_use = gettext('Yes') else value.in_use = gettext('No') - value.owner = gui.fastLink(value.owner, "#{value.owner_info.auth_id},u#{value.owner_info.user_id}", 'gui.servicesPools.fastLink', 'goAuthLink') + value.owner = gui.fastLink(value.owner.replace /@/, '@', "#{value.owner_info.auth_id},u#{value.owner_info.user_id}", 'gui.servicesPools.fastLink', 'goAuthLink') return