From 30bfcb97905c043b94f2fd996d4dfb540883588d Mon Sep 17 00:00:00 2001 From: nir-sopher Date: Thu, 6 Apr 2017 19:44:55 +0300 Subject: [PATCH] org tenancy - verify tenant user test stability --- traffic_ops/app/lib/API/Tenant.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/traffic_ops/app/lib/API/Tenant.pm b/traffic_ops/app/lib/API/Tenant.pm index 4b74e25257..d630146d9f 100644 --- a/traffic_ops/app/lib/API/Tenant.pm +++ b/traffic_ops/app/lib/API/Tenant.pm @@ -219,12 +219,12 @@ sub delete { } my $name = $self->db->resultset('Tenant')->search( { id => $id } )->get_column('name')->single(); - my $existing_child = $self->db->resultset('Tenant')->search( { parent_id => $id } )->get_column('name')->first(); + my $existing_child = $self->db->resultset('Tenant')->search( { parent_id => $id }, {order_by => 'me.name' } )->get_column('name')->first(); if ($existing_child) { return $self->alert("Tenant '$name' has children tenant(s): e.g '$existing_child'. Please update these tenants and retry."); } - my $existing_user = $self->db->resultset('TmUser')->search( { tenant_id => $id })->get_column('username')->first(); + my $existing_user = $self->db->resultset('TmUser')->search( { tenant_id => $id }, {order_by => 'me.username' })->get_column('username')->first(); if ($existing_user) { return $self->alert("Tenant '$name' is assign with user(s): e.g. '$existing_user'. Please update these users and retry."); }