Skip to content
This repository has been archived by the owner on Nov 13, 2018. It is now read-only.

Fix TO Diff CRConfig to check Geolimit Countrycode #1418

Merged
merged 1 commit into from
May 12, 2016
Merged

Fix TO Diff CRConfig to check Geolimit Countrycode #1418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion traffic_ops/app/lib/UI/Cdn.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,7 @@ sub aphys_location {
sub adeliveryservice {
my $self = shift;
my %data = ( "aaData" => undef );
my %geo_limits = ( 0 => "none", 1 => "CZF", 2 => "CZF + US", 3 => "CZF + CA" );
my %geo_limits = ( 0 => "none", 1 => "CZF", 2 => "CZF + Countries" );
my %protocol = ( 0 => "http", 1 => "https", 2 => "http/https" );

my $rs = $self->db->resultset('Deliveryservice')->search(
Expand Down
5 changes: 4 additions & 1 deletion traffic_ops/app/lib/UI/Topology.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -674,7 +674,10 @@ sub stringify_ds {
}
$string .= "|<br>&emsp;CZF Only:" . $ds->{'coverageZoneOnly'};
if ( defined( $ds->{'geoEnabled'} ) ) {
$string .= "|Geo Limit: true; Country: " . $ds->{'geoEnabled'}->[0]->{'countryCode'};
$string .= "|Geo Limit: true; Countries: ";
foreach my $country ( @{ $ds->{'geoEnabled'} } ) {
$string .= $country->{'countryCode'} . " ";
}
}
if ( defined( $ds->{'missLocation'} ) ) {
$string .= "|GeoMiss: " . $ds->{'missLocation'}->{'lat'} . "," . $ds->{'missLocation'}->{'long'};
Expand Down