This is an automated email from the ASF dual-hosted git repository.
dewrich pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-trafficcontrol.git
The following commit(s) were added to refs/heads/master by this push:
new eb7fd21 only show 'manage keys' button on ds forms if protocol>0 or
signingAlgorithm is not null but only once the change is persisted
eb7fd21 is described below
commit eb7fd21bfdd7b0997ccbc46610ab9aa549c7c5cd
Author: Jeremy Mitchell <mitchell...@gmail.com>
AuthorDate: Thu Feb 1 14:55:14 2018 -0700
only show 'manage keys' button on ds forms if protocol>0 or
signingAlgorithm is not null but only once the change is persisted
---
.../modules/form/deliveryService/FormDeliveryServiceController.js | 6 ++++++
.../form/deliveryService/form.deliveryService.DNS.tpl.html | 8 ++++----
.../form/deliveryService/form.deliveryService.HTTP.tpl.html | 8 ++++----
.../form/deliveryService/form.deliveryService.Steering.tpl.html | 7 ++++---
.../form/deliveryService/form.deliveryService.anyMap.tpl.html | 7 ++++---
5 files changed, 22 insertions(+), 14 deletions(-)
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 40ad3ab..3319bc7 100644
---
a/traffic_portal/app/src/common/modules/form/deliveryService/FormDeliveryServiceController.js
+++
b/traffic_portal/app/src/common/modules/form/deliveryService/FormDeliveryServiceController.js
@@ -45,6 +45,12 @@ var FormDeliveryServiceController =
function(deliveryService, type, types, $scop
$scope.deliveryService = deliveryService;
+ $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 08200d6..29fa9f6 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
@@ -25,14 +25,14 @@ under the License.
</ol>
<div class="pull-right" role="group" ng-show="!settings.isNew">
<div class="btn-group" role="group" uib-dropdown
is-open="keys.isopen">
- <button
ng-show="(deliveryService.protocol>0)||(deliveryService.signingAlgorithm)"
type="button" class="btn btn-primary dropdown-toggle" uib-dropdown-toggle
aria-haspopup="true" aria-expanded="false">
+ <button ng-if="manageKeys.sslKeys || manageKeys.urlSigKeys ||
manageKeys.uriSigningKeys" type="button" class="btn btn-primary
dropdown-toggle" uib-dropdown-toggle aria-haspopup="true" aria-expanded="false">
<i class="fa fa-key"></i>
<span class="caret"></span>
</button>
<ul class="dropdown-menu-right dropdown-menu"
uib-dropdown-menu>
- <li role="menuitem"><a
ng-show="deliveryService.protocol>0" ng-click="manageSslKeys()">Manage SSL
Keys</a></li>
- <li role="menuitem"><a
ng-show="deliveryService.signingAlgorithm=='url_sig'"
ng-click="manageUrlSigKeys()">Manage URL Sig Keys</a></li>
- <li role="menuitem"><a
ng-show="deliveryService.signingAlgorithm=='uri_signing'"
ng-click="manageUriSigningKeys()">Manage URI Signing Keys</a></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>
</ul>
</div>
<div class="btn-group" role="group" uib-dropdown
is-open="more.isopen">
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 a36afe6..5f6d415 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
@@ -25,14 +25,14 @@ under the License.
</ol>
<div class="pull-right" role="group" ng-show="!settings.isNew">
<div class="btn-group" role="group" uib-dropdown
is-open="keys.isopen">
- <button
ng-show="(deliveryService.protocol>0)||(deliveryService.signingAlgorithm)"
type="button" class="btn btn-primary dropdown-toggle" uib-dropdown-toggle
aria-haspopup="true" aria-expanded="false">
+ <button ng-if="manageKeys.sslKeys || manageKeys.urlSigKeys ||
manageKeys.uriSigningKeys" type="button" class="btn btn-primary
dropdown-toggle" uib-dropdown-toggle aria-haspopup="true" aria-expanded="false">
<i class="fa fa-key"></i>
<span class="caret"></span>
</button>
<ul class="dropdown-menu-right dropdown-menu"
uib-dropdown-menu>
- <li role="menuitem"><a
ng-show="deliveryService.protocol>0" ng-click="manageSslKeys()">Manage SSL
Keys</a></li>
- <li role="menuitem"><a
ng-show="deliveryService.signingAlgorithm=='url_sig'"
ng-click="manageUrlSigKeys()">Manage URL Sig Keys</a></li>
- <li role="menuitem"><a
ng-show="deliveryService.signingAlgorithm=='uri_signing'"
ng-click="manageUriSigningKeys()">Manage URI Signing Keys</a></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>
</ul>
</div>
<div class="btn-group" role="group" uib-dropdown
is-open="more.isopen">
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 be238f6..4c7a4d6 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
@@ -25,13 +25,14 @@ under the License.
</ol>
<div class="pull-right" role="group" ng-show="!settings.isNew">
<div class="btn-group" role="group" uib-dropdown
is-open="keys.isopen">
- <button
ng-show="(deliveryService.protocol>0)||(deliveryService.signed==true)"
type="button" class="btn btn-primary dropdown-toggle" uib-dropdown-toggle
aria-haspopup="true" aria-expanded="false">
+ <button ng-if="manageKeys.sslKeys || manageKeys.urlSigKeys ||
manageKeys.uriSigningKeys" type="button" class="btn btn-primary
dropdown-toggle" uib-dropdown-toggle aria-haspopup="true" aria-expanded="false">
<i class="fa fa-key"></i>
<span class="caret"></span>
</button>
<ul class="dropdown-menu-right dropdown-menu"
uib-dropdown-menu>
- <li role="menuitem"><a
ng-show="deliveryService.protocol>0" ng-click="manageSslKeys()">Manage SSL
Keys</a></li>
- <li role="menuitem"><a
ng-show="deliveryService.signed==true" ng-click="manageUrlSigKeys()">Manage URL
Sig Keys</a></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>
</ul>
</div>
<div class="btn-group" role="group" uib-dropdown
is-open="more.isopen">
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 bb1d361..4dde194 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
@@ -25,13 +25,14 @@ under the License.
</ol>
<div class="pull-right" role="group" ng-show="!settings.isNew">
<div class="btn-group" role="group" uib-dropdown
is-open="keys.isopen">
- <button
ng-show="(deliveryService.protocol>0)||(deliveryService.signed==true)"
type="button" class="btn btn-primary dropdown-toggle" uib-dropdown-toggle
aria-haspopup="true" aria-expanded="false">
+ <button ng-if="manageKeys.sslKeys || manageKeys.urlSigKeys ||
manageKeys.uriSigningKeys" type="button" class="btn btn-primary
dropdown-toggle" uib-dropdown-toggle aria-haspopup="true" aria-expanded="false">
<i class="fa fa-key"></i>
<span class="caret"></span>
</button>
<ul class="dropdown-menu-right dropdown-menu"
uib-dropdown-menu>
- <li role="menuitem"><a
ng-show="deliveryService.protocol>0" ng-click="manageSslKeys()">Manage SSL
Keys</a></li>
- <li role="menuitem"><a
ng-show="deliveryService.signed==true" ng-click="manageUrlSigKeys()">Manage URL
Sig Keys</a></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>
</ul>
</div>
<div class="btn-group" role="group" uib-dropdown
is-open="more.isopen">
--
To stop receiving notification emails like this one, please contact
dewr...@apache.org.
