Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Removes invalid 'ALL cdn' options from TP #6437

Merged
merged 3 commits into from
Dec 20, 2021
Merged

Removes invalid 'ALL cdn' options from TP #6437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
02acd35
removes the ALL cdn from the list of snappable and queueable cdns
mitchell852 Dec 17, 2021
682ff12
removes invalid UI options from the ALL cdn
mitchell852 Dec 17, 2021
ab9f5ef
changelog.md entry
mitchell852 Dec 17, 2021
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
- Traffic Vault: Added additional flag to TV Riak (Deprecated) Util

### Fixed
- [#6411](https://github.com/apache/trafficcontrol/pull/6411) Removes invalid 'ALL cdn' options from TP
- [#6197](https://github.com/apache/trafficcontrol/issues/6197) - TO `/deliveryservices/:id/routing` makes requests to all TRs instead of by CDN.
- Fixed Traffic Router crs/stats to prevent overflow and to correctly record the time used in averages.
- [#6209](https://github.com/apache/trafficcontrol/pull/6209) Updated Traffic Router to use Java 11 to compile and run
Expand Down
12 changes: 6 additions & 6 deletions traffic_portal/app/src/common/modules/form/cdn/form.cdn.tpl.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
<li class="active">{{cdnName}}</li>
</ol>
<div class="pull-right" ng-show="!settings.isNew">
<button name="diffCDNbtn" class="btn btn-primary" title="Diff CDN Snapshot" ng-click="viewConfig()"><i class="fa fa-camera"></i>&nbsp;&nbsp;Diff CDN Config Snapshot</button>
<div class="btn-group" role="group" uib-dropdown is-open="queue.isopen">
<button ng-show="cdn.name != 'ALL'" name="diffCDNbtn" class="btn btn-primary" title="Diff CDN Snapshot" ng-click="viewConfig()"><i class="fa fa-camera"></i>&nbsp;&nbsp;Diff CDN Config Snapshot</button>
<div ng-show="cdn.name != 'ALL'" class="btn-group" role="group" uib-dropdown is-open="queue.isopen">
<button type="button" class="btn btn-primary dropdown-toggle" uib-dropdown-toggle aria-haspopup="true" aria-expanded="false">
Queue Updates&nbsp;
<span class="caret"></span>
Expand All @@ -41,10 +41,10 @@
<span class="caret"></span>
</button>
<ul class="dropdown-menu-right dropdown-menu" uib-dropdown-menu>
<li role="menuitem"><a ng-click="manageDNSSEC()">Manage DNSSEC Keys</a></li>
<li role="menuitem"><a ng-click="manageFederations()">Manage Federations</a></li>
<li class="divider"></li>
<li role="menuitem"><a ng-click="viewDeliveryServices()">View Delivery Services</a></li>
<li ng-show="cdn.name != 'ALL'" role="menuitem"><a ng-click="manageDNSSEC()">Manage DNSSEC Keys</a></li>
<li ng-show="cdn.name != 'ALL'" role="menuitem"><a ng-click="manageFederations()">Manage Federations</a></li>
<li ng-show="cdn.name != 'ALL'" class="divider"></li>
<li ng-show="cdn.name != 'ALL'" role="menuitem"><a ng-click="viewDeliveryServices()">View Delivery Services</a></li>
<li role="menuitem"><a ng-click="viewProfiles()">View Profiles</a></li>
<li role="menuitem"><a ng-click="viewServers()">View Servers</a></li>
<li class="divider"></li>
Expand Down
8 changes: 6 additions & 2 deletions traffic_portal/app/src/common/modules/header/HeaderController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,9 @@ var HeaderController = function($rootScope, $scope, $state, $uibModal, $location
return params;
},
collection: function() {
return $scope.cdns;
return $scope.cdns.filter(function(cdn) {
return cdn.name != 'ALL';
});
}
}
});
Expand Down Expand Up @@ -161,7 +163,9 @@ var HeaderController = function($rootScope, $scope, $state, $uibModal, $location
return params;
},
collection: function() {
return $scope.cdns;
return $scope.cdns.filter(function(cdn) {
return cdn.name != 'ALL';
});
}
}
});
Expand Down