Following a PR review: removing a commented out code, to be added later on
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/e8cdfebf Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/e8cdfebf Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/e8cdfebf Branch: refs/heads/master Commit: e8cdfebf83a230e8309d404c820315e6671a4827 Parents: 7c7ace4 Author: nir-sopher <nirsop...@gmail.com> Authored: Fri Mar 17 11:45:38 2017 +0200 Committer: Jeremy Mitchell <mitchell...@gmail.com> Committed: Sun Mar 19 19:08:28 2017 -0600 ---------------------------------------------------------------------- traffic_ops/app/lib/API/Tenant.pm | 16 ---------------- 1 file changed, 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/e8cdfebf/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 309b99c..6daba56 100644 --- a/traffic_ops/app/lib/API/Tenant.pm +++ b/traffic_ops/app/lib/API/Tenant.pm @@ -220,22 +220,6 @@ sub delete { return $self->alert("Tenant '$name' has children tenant(s): e.g '$existing_child'. Please update these tenants and retry."); } - #The order of the below tests is intentional - allowing UT to cover all cases - TODO(nirs) remove this comment when a full "tenancy" UT is added, including permissions and such (no use in putting effort into it yet) - #TODO(nirs) - add back when making available: my $existing_ds = $self->db->resultset('Deliveryservice')->search( { tenant_id => $id })->get_column('xml_id')->first(); - #TODO(nirs) - add back when making available: if ($existing_ds) { - #TODO(nirs) - add back when making available: return $self->alert("Tenant '$name' is assign with delivery-services(s): e.g. '$existing_ds'. Please update/delete these delivery-services and retry."); - #TODO(nirs) - add back when making available: } - - #TODO(nirs) - add back when making available: my $existing_cdn = $self->db->resultset('Cdn')->search( { tenant_id => $id })->get_column('name')->first(); - #TODO(nirs) - add back when making available: if ($existing_cdn) { - #TODO(nirs) - add back when making available: return $self->alert("Tenant '$name' is assign with CDNs(s): e.g. '$existing_cdn'. Please update/delete these CDNs and retry."); - #TODO(nirs) - add back when making available: } - - #TODO(nirs) - add back when making available: my $existing_user = $self->db->resultset('TmUser')->search( { tenant_id => $id })->get_column('username')->first(); - #TODO(nirs) - add back when making available: if ($existing_user) { - #TODO(nirs) - add back when making available: return $self->alert("Tenant '$name' is assign with user(s): e.g. '$existing_user'. Please update these users and retry."); - #TODO(nirs) - add back when making available: } - my $rs = $tenant->delete(); if ($rs) { return $self->success_message("Tenant deleted.");
