You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@trafficcontrol.apache.org by GitBox <gi...@apache.org> on 2018/02/26 21:58:14 UTC
[GitHub] dangogh closed pull request #1930: [Issue 1687] - adds manage ssl keys, url sig keys and uri signing keys menu items to?
dangogh closed pull request #1930: [Issue 1687] - adds manage ssl keys, url sig keys and uri signing keys menu items to?
URL: https://github.com/apache/incubator-trafficcontrol/pull/1930
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/traffic_portal/app/src/common/modules/form/deliveryService/FormDeliveryServiceController.js b/traffic_portal/app/src/common/modules/form/deliveryService/FormDeliveryServiceController.js
index 43374a303c..834949b1b8 100644
--- a/traffic_portal/app/src/common/modules/form/deliveryService/FormDeliveryServiceController.js
+++ b/traffic_portal/app/src/common/modules/form/deliveryService/FormDeliveryServiceController.js
@@ -51,12 +51,6 @@ var FormDeliveryServiceController = function(deliveryService, dsCurrent, type, t
$scope.dsRequestsEnabled = propertiesModel.properties.dsRequests.enabled;
- $scope.manageKeys = {
- sslKeys: deliveryService.protocol > 0,
- urlSigKeys: deliveryService.signingAlgorithm == 'url_sig',
- uriSigningKeys: deliveryService.signingAlgorithm == 'uri_signing'
- };
-
$scope.edgeFQDNs = function(ds) {
var urlString = '';
if (_.isArray(ds.exampleURLs) && ds.exampleURLs.length > 0) {
diff --git a/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.DNS.tpl.html b/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.DNS.tpl.html
index a4a7573c5e..c91b146830 100644
--- a/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.DNS.tpl.html
+++ b/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.DNS.tpl.html
@@ -38,14 +38,13 @@
<ul class="dropdown-menu-right dropdown-menu" uib-dropdown-menu>
<li role="menuitem"><a ng-click="clone(deliveryService)">Clone Delivery Service</a></li>
<li class="divider"></li>
- <li role="menuitem"><a ng-if="manageKeys.sslKeys" ng-click="manageSslKeys()">Manage SSL Keys</a></li>
- <li role="menuitem"><a ng-if="manageKeys.urlSigKeys" ng-click="manageUrlSigKeys()">Manage URL Sig Keys</a></li>
- <li role="menuitem"><a ng-if="manageKeys.uriSigningKeys" ng-click="manageUriSigningKeys()">Manage URI Signing Keys</a></li>
- <li class="divider" ng-if="manageKeys.sslKeys || manageKeys.urlSigKeys || manageKeys.uriSigningKeys"></li>
+ <li role="menuitem"><a ng-click="manageSslKeys()">Manage SSL Keys</a></li>
+ <li role="menuitem"><a ng-click="manageUrlSigKeys()">Manage URL Sig Keys</a></li>
+ <li role="menuitem"><a ng-click="manageUriSigningKeys()">Manage URI Signing Keys</a></li>
+ <li class="divider"></li>
<li role="menuitem"><a ng-click="viewServers()">View Servers</a></li>
<li role="menuitem"><a ng-click="viewRegexes()">View Regexes</a></li>
<li role="menuitem"><a ng-click="viewJobs()">View Invalidate Content Jobs</a></li>
- <li role="menuitem"><a ng-click="viewStaticDnsEntries()">View Static DNS Entries</a></li>
</ul>
</div>
</div>
diff --git a/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.HTTP.tpl.html b/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.HTTP.tpl.html
index 759bd214f8..1acb889c62 100644
--- a/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.HTTP.tpl.html
+++ b/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.HTTP.tpl.html
@@ -38,14 +38,13 @@
<ul class="dropdown-menu-right dropdown-menu" uib-dropdown-menu>
<li role="menuitem"><a ng-click="clone(deliveryService)">Clone Delivery Service</a></li>
<li class="divider"></li>
- <li role="menuitem"><a ng-if="manageKeys.sslKeys" ng-click="manageSslKeys()">Manage SSL Keys</a></li>
- <li role="menuitem"><a ng-if="manageKeys.urlSigKeys" ng-click="manageUrlSigKeys()">Manage URL Sig Keys</a></li>
- <li role="menuitem"><a ng-if="manageKeys.uriSigningKeys" ng-click="manageUriSigningKeys()">Manage URI Signing Keys</a></li>
- <li class="divider" ng-if="manageKeys.sslKeys || manageKeys.urlSigKeys || manageKeys.uriSigningKeys"></li>
+ <li role="menuitem"><a ng-click="manageSslKeys()">Manage SSL Keys</a></li>
+ <li role="menuitem"><a ng-click="manageUrlSigKeys()">Manage URL Sig Keys</a></li>
+ <li role="menuitem"><a ng-click="manageUriSigningKeys()">Manage URI Signing Keys</a></li>
+ <li class="divider"></li>
<li role="menuitem"><a ng-click="viewServers()">View Servers</a></li>
<li role="menuitem"><a ng-click="viewRegexes()">View Regexes</a></li>
<li role="menuitem"><a ng-click="viewJobs()">View Invalidate Content Jobs</a></li>
- <li role="menuitem"><a ng-click="viewStaticDnsEntries()">View Static DNS Entries</a></li>
</ul>
</div>
</div>
diff --git a/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.Steering.tpl.html b/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.Steering.tpl.html
index 3089f75858..ff4cb9f7b9 100644
--- a/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.Steering.tpl.html
+++ b/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.Steering.tpl.html
@@ -38,14 +38,11 @@
<ul class="dropdown-menu-right dropdown-menu" uib-dropdown-menu>
<li role="menuitem"><a ng-click="clone(deliveryService)">Clone Delivery Service</a></li>
<li class="divider"></li>
- <li role="menuitem"><a ng-if="manageKeys.sslKeys" ng-click="manageSslKeys()">Manage SSL Keys</a></li>
- <li role="menuitem"><a ng-if="manageKeys.urlSigKeys" ng-click="manageUrlSigKeys()">Manage URL Sig Keys</a></li>
- <li role="menuitem"><a ng-if="manageKeys.uriSigningKeys" ng-click="manageUriSigningKeys()">Manage URI Signing Keys</a></li>
- <li class="divider" ng-if="manageKeys.sslKeys || manageKeys.urlSigKeys || manageKeys.uriSigningKeys"></li>
+ <li role="menuitem"><a ng-click="manageSslKeys()">Manage SSL Keys</a></li>
+ <li class="divider"></li>
<li role="menuitem"><a ng-click="viewTargets()">View Targets</a></li>
<li role="menuitem"><a ng-click="viewRegexes()">View Regexes</a></li>
<li role="menuitem"><a ng-click="viewJobs()">View Invalidate Content Jobs</a></li>
- <li role="menuitem"><a ng-click="viewStaticDnsEntries()">View Static DNS Entries</a></li>
</ul>
</div>
</div>
diff --git a/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.anyMap.tpl.html b/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.anyMap.tpl.html
index 005285d465..740686651d 100644
--- a/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.anyMap.tpl.html
+++ b/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.anyMap.tpl.html
@@ -38,14 +38,9 @@
<ul class="dropdown-menu-right dropdown-menu" uib-dropdown-menu>
<li role="menuitem"><a ng-click="clone(deliveryService)">Clone Delivery Service</a></li>
<li class="divider"></li>
- <li role="menuitem"><a ng-if="manageKeys.sslKeys" ng-click="manageSslKeys()">Manage SSL Keys</a></li>
- <li role="menuitem"><a ng-if="manageKeys.urlSigKeys" ng-click="manageUrlSigKeys()">Manage URL Sig Keys</a></li>
- <li role="menuitem"><a ng-if="manageKeys.uriSigningKeys" ng-click="manageUriSigningKeys()">Manage URI Signing Keys</a></li>
- <li class="divider" ng-if="manageKeys.sslKeys || manageKeys.urlSigKeys || manageKeys.uriSigningKeys"></li>
<li role="menuitem"><a ng-click="viewServers()">View Servers</a></li>
<li role="menuitem"><a ng-click="viewRegexes()">View Regexes</a></li>
<li role="menuitem"><a ng-click="viewJobs()">View Invalidate Content Jobs</a></li>
- <li role="menuitem"><a ng-click="viewStaticDnsEntries()">View Static DNS Entries</a></li>
</ul>
</div>
</div>
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services