trafficcontrol-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mitchell...@apache.org
Subject [10/14] incubator-trafficcontrol git commit: tenancy ds test - verify stability
Date Mon, 10 Jul 2017 20:50:02 GMT
tenancy ds test - verify stability


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/0b0d9e54
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/0b0d9e54
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/0b0d9e54

Branch: refs/heads/master
Commit: 0b0d9e5411f863059e5667ae49f29c7ca2b2dcfe
Parents: c9d117c
Author: nir-sopher <nirsopher@gmail.com>
Authored: Thu Apr 6 19:36:47 2017 +0300
Committer: Jeremy Mitchell <mitchell852@gmail.com>
Committed: Mon Jul 10 14:41:42 2017 -0600

----------------------------------------------------------------------
 traffic_ops/app/lib/API/Tenant.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/0b0d9e54/traffic_ops/app/lib/API/Tenant.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/API/Tenant.pm b/traffic_ops/app/lib/API/Tenant.pm
index c21528b..3bcdd0f 100644
--- a/traffic_ops/app/lib/API/Tenant.pm
+++ b/traffic_ops/app/lib/API/Tenant.pm
@@ -256,7 +256,7 @@ sub delete {
 	}
 
 	#The order of the below tests is intentional
-	my $existing_ds = $self->db->resultset('Deliveryservice')->search( { tenant_id
=> $id })->get_column('xml_id')->first();
+	my $existing_ds = $self->db->resultset('Deliveryservice')->search( { tenant_id
=> $id }, {order_by => 'me.xml_id' })->get_column('xml_id')->first();
 	if ($existing_ds) {
 		return $self->alert("Tenant '$name' is assign with delivery-services(s): e.g. '$existing_ds'.
Please update/delete these delivery-services and retry.");
 	}


Mime
View raw message