This is an automated email from the ASF dual-hosted git repository.
ocket8888 pushed a commit to branch 5.0.x
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
The following commit(s) were added to refs/heads/5.0.x by this push:
new abda257 Removed duplicate button to link delivery service to server
(#5219)
abda257 is described below
commit abda2574cdeab7c267ee9510577035940290ed88
Author: rimashah25 <[email protected]>
AuthorDate: Thu Oct 29 15:18:08 2020 -0600
Removed duplicate button to link delivery service to server (#5219)
* Removed duplicate button to link delivery service to server
* Updated CHANGELOG.md
* Added github number
(cherry picked from commit 2cc68b50b0b6c4cca847b39c5ea6d6d58b4722d3)
---
CHANGELOG.md | 11 ++++++-----
.../table.serverDeliveryServices.tpl.html | 5 ++---
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ceb6475..fee821f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -67,11 +67,11 @@ The format is based on [Keep a
Changelog](http://keepachangelog.com/en/1.0.0/).
- Added default sort logic to GET API calls using Read()
### Fixed
-- Fixed #5188 - DSR (delivery service request) incorrectly marked as complete
and error message not displaying when DSR fulfilled and DS update fails in
Traffic Portal. [Related Github
issues](https://github.com/apache/trafficcontrol/issues/5188)
-- Fixed #3455 - Alphabetically sorting CDN Read API call [Related Github
issues](https://github.com/apache/trafficcontrol/issues/3455)
-- Fixed #5010 - Fixed Reference urls for Cache Config on Delivery service
pages (HTTP, DNS) in Traffic Portal. [Related Github
issues](https://github.com/apache/trafficcontrol/issues/5010)
-- Fixed #5147 - GET /servers?dsId={id} should only return mid servers (in
addition to edge servers) for the cdn of the delivery service if the mid tier
is employed. [Related github
issues](https://github.com/apache/trafficcontrol/issues/5147)
-- Fixed #4981 - Cannot create routing regular expression with a blank pattern
param in Delivery Service [Related github
issues](https://github.com/apache/trafficcontrol/issues/4981)
+- Fixed #5188 - DSR (delivery service request) incorrectly marked as complete
and error message not displaying when DSR fulfilled and DS update fails in
Traffic Portal. [Related Github
issue](https://github.com/apache/trafficcontrol/issues/5188)
+- Fixed #3455 - Alphabetically sorting CDN Read API call [Related Github
issue](https://github.com/apache/trafficcontrol/issues/3455)
+- Fixed #5010 - Fixed Reference urls for Cache Config on Delivery service
pages (HTTP, DNS) in Traffic Portal. [Related Github
issue](https://github.com/apache/trafficcontrol/issues/5010)
+- Fixed #5147 - GET /servers?dsId={id} should only return mid servers (in
addition to edge servers) for the cdn of the delivery service if the mid tier
is employed. [Related github
issue](https://github.com/apache/trafficcontrol/issues/5147)
+- Fixed #4981 - Cannot create routing regular expression with a blank pattern
param in Delivery Service [Related github
issue](https://github.com/apache/trafficcontrol/issues/4981)
- Fixed #4979 - Returns a Bad Request error during server creation with
missing profileId [Related github
issue](https://github.com/apache/trafficcontrol/issues/4979)
- Fixed #4237 - Do not return an internal server error when delivery service's
capacity is zero. [Related github
issue](https://github.com/apache/trafficcontrol/issues/4237)
- Fixed #2712 - Invalid TM logrotate configuration permissions causing TM logs
to be ignored by logrotate. [Related github
issue](https://github.com/apache/trafficcontrol/issues/2712)
@@ -116,6 +116,7 @@ The format is based on [Keep a
Changelog](http://keepachangelog.com/en/1.0.0/).
- Fixed an issue where the jobs and servers table in Traffic Portal would not
clear a column's filter when it's hidden
- Fixed an issue with Traffic Router failing to authenticate if secrets are
changed
- Fixed validation error message for Traffic Ops `POST
/api/x/profileparameters` route
+- Fixed #5216 - Removed duplicate button to link delivery service to server
[Related Github issue](https://github.com/apache/trafficcontrol/issues/5216)
### Changed
- Changed some Traffic Ops Go Client methods to use `DeliveryServiceNullable`
inputs and outputs.
diff --git
a/traffic_portal/app/src/common/modules/table/serverDeliveryServices/table.serverDeliveryServices.tpl.html
b/traffic_portal/app/src/common/modules/table/serverDeliveryServices/table.serverDeliveryServices.tpl.html
index b4fe8ff..fc6c78b 100644
---
a/traffic_portal/app/src/common/modules/table/serverDeliveryServices/table.serverDeliveryServices.tpl.html
+++
b/traffic_portal/app/src/common/modules/table/serverDeliveryServices/table.serverDeliveryServices.tpl.html
@@ -41,13 +41,12 @@ under the License.
</menu>
</div>
<div class="btn-group" role="group" ng-show="isEdge(server) ||
isOrigin(server)" uib-dropdown is-open="more.isopen">
- <button name="moreBtn" type="button" class="btn btn-default
dropdown-toggle" uib-dropdown-toggle aria-haspopup="true" aria-expanded="false">
+ <button ng-if="isEdge(server) && deliveryServices.length > 0"
name="moreBtn" type="button" class="btn btn-default dropdown-toggle"
uib-dropdown-toggle aria-haspopup="true" aria-expanded="false">
More
<span class="caret"></span>
</button>
<ul class="dropdown-menu-right dropdown-menu"
uib-dropdown-menu>
- <li><a ng-click="selectDeliveryServices(server)">Link
Delivery Services to Server</a></li>
- <li ng-if="isEdge(server) && deliveryServices.length >
0"><a class="clone-ds-assignments" ng-click="cloneDsAssignments()">Clone
Delivery Service Assignments</a></li>
+ <li><a class="clone-ds-assignments"
ng-click="cloneDsAssignments()">Clone Delivery Service Assignments</a></li>
</ul>
</div>
</div>
