You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by de...@apache.org on 2018/02/21 18:27:31 UTC
[incubator-trafficcontrol] 15/33: provides a label for ds magic
numbers (i.e. protocol, geoLimit,
etc). useful when showing the diff between a ds request and a ds. magic
numbers don't make a lot of sense to humans.
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
commit 8db7428cb395c08e3b55dc7fb638cbb5e3cb2db6
Author: Jeremy Mitchell <mi...@gmail.com>
AuthorDate: Thu Jan 18 10:37:47 2018 -0700
provides a label for ds magic numbers (i.e. protocol, geoLimit, etc). useful when showing the diff between a ds request and a ds. magic numbers don't make a lot of sense to humans.
---
.../FormDeliveryServiceController.js | 9 +-
.../edit/FormEditDeliveryServiceController.js | 8 +-
.../form.deliveryService.DNS.tpl.html | 96 +++++++++++-----------
.../form.deliveryService.HTTP.tpl.html | 94 ++++++++++-----------
.../form.deliveryService.Steering.tpl.html | 48 +++++------
.../form.deliveryService.anyMap.tpl.html | 52 ++++++------
.../new/FormNewDeliveryServiceController.js | 2 +-
.../TableDeliveryServiceRequestsController.js | 5 +-
.../FormEditDeliveryServiceRequestController.js | 16 ++--
9 files changed, 165 insertions(+), 165 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 2cc3963..be7a822 100644
--- a/traffic_portal/app/src/common/modules/form/deliveryService/FormDeliveryServiceController.js
+++ b/traffic_portal/app/src/common/modules/form/deliveryService/FormDeliveryServiceController.js
@@ -17,7 +17,7 @@
* under the License.
*/
-var FormDeliveryServiceController = function(deliveryService, type, types, $scope, $location, $uibModal, formUtils, locationUtils, tenantUtils, cdnService, profileService, tenantService, propertiesModel) {
+var FormDeliveryServiceController = function(deliveryService, dsCurrent, type, types, $scope, $location, $uibModal, formUtils, locationUtils, tenantUtils, cdnService, profileService, tenantService, propertiesModel) {
var getCDNs = function() {
cdnService.getCDNs()
@@ -45,7 +45,7 @@ var FormDeliveryServiceController = function(deliveryService, type, types, $scop
$scope.deliveryService = deliveryService;
- $scope.dsOriginal = dsOriginal; // this ds is used primarily for showing the diff between a ds request and the original DS
+ $scope.dsCurrent = dsCurrent; // this ds is used primarily for showing the diff between a ds request and the current DS
$scope.dsRequestsEnabled = propertiesModel.properties.dsRequests.enabled;
@@ -72,10 +72,12 @@ var FormDeliveryServiceController = function(deliveryService, type, types, $scop
$scope.COMPLETE = 4;
$scope.saveable = function() {
+ // this may be overriden in a child class. i.e. FormEditDeliveryServiceController
return true;
};
$scope.deletable = function() {
+ // this may be overriden in a child class. i.e. FormEditDeliveryServiceController
return true;
};
@@ -277,6 +279,5 @@ var FormDeliveryServiceController = function(deliveryService, type, types, $scop
};
-FormDeliveryServiceController.$inject = ['deliveryService', 'type', 'types', '$scope', '$location', '$uibModal', 'formUtils', 'locationUtils', 'tenantUtils', 'cdnService', 'profileService', 'tenantService', 'propertiesModel'];
-
+FormDeliveryServiceController.$inject = ['deliveryService', 'dsCurrent', 'type', 'types', '$scope', '$location', '$uibModal', 'formUtils', 'locationUtils', 'tenantUtils', 'cdnService', 'profileService', 'tenantService', 'propertiesModel'];
module.exports = FormDeliveryServiceController;
diff --git a/traffic_portal/app/src/common/modules/form/deliveryService/edit/FormEditDeliveryServiceController.js b/traffic_portal/app/src/common/modules/form/deliveryService/edit/FormEditDeliveryServiceController.js
index c026382..c44ea63 100644
--- a/traffic_portal/app/src/common/modules/form/deliveryService/edit/FormEditDeliveryServiceController.js
+++ b/traffic_portal/app/src/common/modules/form/deliveryService/edit/FormEditDeliveryServiceController.js
@@ -20,12 +20,12 @@
var FormEditDeliveryServiceController = function(deliveryService, type, types, $scope, $state, $controller, $uibModal, locationUtils, deliveryServiceService, deliveryServiceRequestService) {
// extends the FormDeliveryServiceController to inherit common methods
- angular.extend(this, $controller('FormDeliveryServiceController', { deliveryService: deliveryService, dsOriginal: deliveryService, type: type, types: types, $scope: $scope }));
+ angular.extend(this, $controller('FormDeliveryServiceController', { deliveryService: deliveryService, dsCurrent: deliveryService, type: type, types: types, $scope: $scope }));
- var createDeliveryServiceRequest = function(deliveryService) {
+ var createDeliveryServiceDeleteRequest = function(deliveryService) {
var params = {
title: "Delivery Service Delete Request",
- message: 'All delivery service changes must be reviewed before completion.<br><br>Are you sure you want to submit a request to delete the ' + deliveryService.xmlId + ' delivery service?'
+ message: 'All delivery service deletions must be reviewed.<br><br>Are you sure you want to submit a request to delete the ' + deliveryService.xmlId + ' delivery service?'
};
var modalInstance = $uibModal.open({
templateUrl: 'common/modules/dialog/confirm/dialog.confirm.tpl.html',
@@ -100,7 +100,7 @@ var FormEditDeliveryServiceController = function(deliveryService, type, types, $
$scope.confirmDelete = function(deliveryService) {
if ($scope.dsRequestsEnabled) {
- createDeliveryServiceRequest(deliveryService);
+ createDeliveryServiceDeleteRequest(deliveryService);
} else {
var params = {
title: 'Delete Delivery Service: ' + deliveryService.displayName,
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 7217c93..7bc7ca7 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
@@ -68,7 +68,7 @@ under the License.
<option value="">Select...</option>
</select>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.active, 'required')">Required</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.active != dsOriginal.active">Current Value: [ {{dsOriginal.active}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.active != dsCurrent.active">Current Value: [ {{dsCurrent.active}} ]</small>
</div>
</div>
@@ -79,7 +79,7 @@ under the License.
<option value="">Select...</option>
</select>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.type, 'required')">Required</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.typeId != dsOriginal.typeId">Current Value: [ {{dsOriginal.type}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.typeId != dsCurrent.typeId">Current Value: [ {{dsCurrent.type}} ]</small>
</div>
</div>
@@ -90,7 +90,7 @@ under the License.
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.xmlId, 'required')">Required</small>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.xmlId, 'maxlength')">Too Long</small>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.xmlId, 'pattern')">No spaces</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.xmlId != dsOriginal.xmlId">Current Value: [ {{dsOriginal.xmlId}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.xmlId != dsCurrent.xmlId">Current Value: [ {{dsCurrent.xmlId}} ]</small>
<span ng-show="hasError(deliveryServiceForm.xmlId)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
</div>
@@ -101,7 +101,7 @@ under the License.
<input name="displayName" type="text" class="form-control" ng-model="deliveryService.displayName" ng-maxlength="48" required autofocus>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.displayName, 'required')">Required</small>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.displayName, 'maxlength')">Too Long</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.displayName != dsOriginal.displayName">Current Value: [ {{dsOriginal.displayName}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.displayName != dsCurrent.displayName">Current Value: [ {{dsCurrent.displayName}} ]</small>
<span ng-show="hasError(deliveryServiceForm.displayName)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
</div>
@@ -113,7 +113,7 @@ under the License.
<option value="">Select...</option>
</select>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.tenantId, 'required')">Required</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.tenantId != dsOriginal.tenantId">Current Value: [ {{dsOriginal.tenant}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.tenantId != dsCurrent.tenantId">Current Value: [ {{dsCurrent.tenant}} ]</small>
</div>
</div>
@@ -124,7 +124,7 @@ under the License.
<option value="">Select...</option>
</select>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.cdn, 'required')">Required</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.cdnId != dsOriginal.cdnId">Current Value: [ {{dsOriginal.cdnName}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.cdnId != dsCurrent.cdnId">Current Value: [ {{dsCurrent.cdnName}} ]</small>
</div>
</div>
@@ -134,7 +134,7 @@ under the License.
<input name="orgServerFqdn" type="text" class="form-control" placeholder="http(s)//:" ng-model="deliveryService.orgServerFqdn" ng-pattern="/^(https?:\/\/)/" required autofocus>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.orgServerFqdn, 'required')">Required</small>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.orgServerFqdn, 'pattern')">Must start with http:// or https://</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.orgServerFqdn != dsOriginal.orgServerFqdn">Current Value: [ {{dsOriginal.orgServerFqdn}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.orgServerFqdn != dsCurrent.orgServerFqdn">Current Value: [ {{dsCurrent.orgServerFqdn}} ]</small>
<span ng-show="hasError(deliveryServiceForm.orgServerFqdn)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
</div>
@@ -146,7 +146,7 @@ under the License.
<option value="">Select...</option>
</select>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.protocol, 'required')">Required</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.protocol != dsOriginal.protocol">Current Value: [ {{magicNumberLabel(protocols, dsOriginal.protocol)}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.protocol != dsCurrent.protocol">Current Value: [ {{magicNumberLabel(protocols, dsCurrent.protocol)}} ]</small>
</div>
</div>
@@ -156,12 +156,12 @@ under the License.
<input name="longDesc" type="text" class="form-control" ng-model="deliveryService.longDesc" ng-maxlength="1024" autofocus required>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.longDesc, 'required')">Required</small>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.longDesc, 'maxlength')">Too Long</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.longDesc != dsOriginal.longDesc">Current Value: [ {{dsOriginal.longDesc}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.longDesc != dsCurrent.longDesc">Current Value: [ {{dsCurrent.longDesc}} ]</small>
<span ng-show="hasError(deliveryServiceForm.longDesc)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
</div>
- <div class="form-group" ng-if="!settings.isNew && deliveryService.exampleURLs.length > 0">
+ <div class="form-group" ng-if="!settings.isNew && !settings.isRequest">
<label class="control-label col-md-2 col-sm-2 col-xs-12">Delivery Service URLs</label>
<div class="col-md-10 col-sm-10 col-xs-12">
<textarea name="edgeFQDNs" rows="4" cols="17" class="form-control readonly" readonly>{{edgeFQDNs(deliveryService)}}</textarea>
@@ -178,7 +178,7 @@ under the License.
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.routingName, 'required')">Required</small>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.routingName, 'maxlength')">Too Long</small>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.routingName, 'pattern')">Invalid. Must be a valid hostname without periods</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.routingName != dsOriginal.routingName">Current Value: [ {{dsOriginal.routingName}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.routingName != dsCurrent.routingName">Current Value: [ {{dsCurrent.routingName}} ]</small>
<span ng-show="hasError(deliveryServiceForm.routingName)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
</div>
@@ -190,7 +190,7 @@ under the License.
<option value="">Select...</option>
</select>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.dscp, 'required')">Required</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.dscp != dsOriginal.dscp">Current Value: [ {{magicNumberLabel(dscps, dsOriginal.dscp)}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.dscp != dsCurrent.dscp">Current Value: [ {{magicNumberLabel(dscps, dsCurrent.dscp)}} ]</small>
</div>
</div>
@@ -201,7 +201,7 @@ under the License.
<option value="">Select...</option>
</select>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.ipv6RoutingEnabled, 'required')">Required</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.ipv6RoutingEnabled != dsOriginal.ipv6RoutingEnabled">Current Value: [ {{dsOriginal.ipv6RoutingEnabled}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.ipv6RoutingEnabled != dsCurrent.ipv6RoutingEnabled">Current Value: [ {{dsCurrent.ipv6RoutingEnabled}} ]</small>
</div>
</div>
@@ -212,7 +212,7 @@ under the License.
<option value="">Select...</option>
</select>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.rangeRequestHandling, 'required')">Required</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.rangeRequestHandling != dsOriginal.rangeRequestHandling">Current Value: [ {{magicNumberLabel(rrhs, dsOriginal.rangeRequestHandling)}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.rangeRequestHandling != dsCurrent.rangeRequestHandling">Current Value: [ {{magicNumberLabel(rrhs, dsCurrent.rangeRequestHandling)}} ]</small>
</div>
</div>
@@ -223,7 +223,7 @@ under the License.
<option value="">Select...</option>
</select>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.qstringIgnore, 'required')">Required</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.qstringIgnore != dsOriginal.qstringIgnore">Current Value: [ {{magicNumberLabel(qStrings, dsOriginal.qstringIgnore)}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.qstringIgnore != dsCurrent.qstringIgnore">Current Value: [ {{magicNumberLabel(qStrings, dsCurrent.qstringIgnore)}} ]</small>
</div>
</div>
@@ -234,7 +234,7 @@ under the License.
<option value="">Select...</option>
</select>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.multiSiteOrigin, 'required')">Required</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.multiSiteOrigin != dsOriginal.multiSiteOrigin">Current Value: [ {{dsOriginal.multiSiteOrigin}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.multiSiteOrigin != dsCurrent.multiSiteOrigin">Current Value: [ {{dsCurrent.multiSiteOrigin}} ]</small>
</div>
</div>
@@ -245,7 +245,7 @@ under the License.
<option value="">Select...</option>
</select>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.logsEnabled, 'required')">Required</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.logsEnabled != dsOriginal.logsEnabled">Current Value: [ {{dsOriginal.logsEnabled}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.logsEnabled != dsCurrent.logsEnabled">Current Value: [ {{dsCurrent.logsEnabled}} ]</small>
</div>
</div>
@@ -256,7 +256,7 @@ under the License.
<option value="">Select...</option>
</select>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.geoProvider, 'required')">Required</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.geoProvider != dsOriginal.geoProvider">Current Value: [ {{magicNumberLabel(geoProviders, dsOriginal.geoProvider)}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.geoProvider != dsCurrent.geoProvider">Current Value: [ {{magicNumberLabel(geoProviders, dsCurrent.geoProvider)}} ]</small>
</div>
</div>
@@ -265,7 +265,7 @@ under the License.
<div class="col-md-10 col-sm-10 col-xs-12">
<input name="missLat" type="number" class="form-control" ng-model="deliveryService.missLat" required autofocus>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.missLat, 'required')">Required</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.missLat != dsOriginal.missLat">Current Value: [ {{dsOriginal.missLat}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.missLat != dsCurrent.missLat">Current Value: [ {{dsCurrent.missLat}} ]</small>
<span ng-show="hasError(deliveryServiceForm.missLat)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
</div>
@@ -275,7 +275,7 @@ under the License.
<div class="col-md-10 col-sm-10 col-xs-12">
<input name="missLong" type="number" class="form-control" ng-model="deliveryService.missLong" required autofocus>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.missLong, 'required')">Required</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.missLong != dsOriginal.missLong">Current Value: [ {{dsOriginal.missLong}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.missLong != dsCurrent.missLong">Current Value: [ {{dsCurrent.missLong}} ]</small>
<span ng-show="hasError(deliveryServiceForm.missLong)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
</div>
@@ -287,7 +287,7 @@ under the License.
<option value="">Select...</option>
</select>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.geoLimit, 'required')">Required</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.geoLimit != dsOriginal.geoLimit">Current Value: [ {{magicNumberLabel(geoLimits, dsOriginal.geoLimit)}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.geoLimit != dsCurrent.geoLimit">Current Value: [ {{magicNumberLabel(geoLimits, dsCurrent.geoLimit)}} ]</small>
</div>
</div>
@@ -296,7 +296,7 @@ under the License.
<div class="col-md-10 col-sm-10 col-xs-12">
<input name="geoLimitCountries" type="text" class="form-control" ng-model="deliveryService.geoLimitCountries" ng-maxlength="255" autofocus>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.geoLimitCountries, 'maxlength')">Too Long</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.geoLimitCountries != dsOriginal.geoLimitCountries">Current Value: [ {{dsOriginal.geoLimitCountries}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.geoLimitCountries != dsCurrent.geoLimitCountries">Current Value: [ {{dsCurrent.geoLimitCountries}} ]</small>
<span ng-show="hasError(deliveryServiceForm.geoLimitCountries)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
</div>
@@ -306,7 +306,7 @@ under the License.
<div class="col-md-10 col-sm-10 col-xs-12">
<input name="geoLimitRedirectURL" type="text" class="form-control" ng-model="deliveryService.geoLimitRedirectURL" ng-pattern="/^(https?:\/\/)/" autofocus>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.geoLimitRedirectURL, 'pattern')">Must start with http:// or https://</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.geoLimitRedirectURL != dsOriginal.geoLimitRedirectURL">Current Value: [ {{dsOriginal.geoLimitRedirectURL}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.geoLimitRedirectURL != dsCurrent.geoLimitRedirectURL">Current Value: [ {{dsCurrent.geoLimitRedirectURL}} ]</small>
<span ng-show="hasError(deliveryServiceForm.geoLimitRedirectURL)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
</div>
@@ -317,7 +317,7 @@ under the License.
<select name="signingAlgorithm" class="form-control" ng-model="deliveryService.signingAlgorithm" ng-options="sa.value as sa.label for sa in signingAlgos">
<option value="">Select...</option>
</select>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.signingAlgorithm != dsOriginal.signingAlgorithm">Current Value: [ {{magicNumberLabel(signingAlgos, dsOriginal.signingAlgorithm)}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.signingAlgorithm != dsCurrent.signingAlgorithm">Current Value: [ {{magicNumberLabel(signingAlgos, dsCurrent.signingAlgorithm)}} ]</small>
</div>
</div>
@@ -326,7 +326,7 @@ under the License.
<div class="col-md-10 col-sm-10 col-xs-12">
<input name="dnsBypassIp" type="text" class="form-control" ng-model="deliveryService.dnsBypassIp" ng-maxlength="255" autofocus>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.dnsBypassIp, 'maxlength')">Too Long</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.dnsBypassIp != dsOriginal.dnsBypassIp">Current Value: [ {{dsOriginal.dnsBypassIp}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.dnsBypassIp != dsCurrent.dnsBypassIp">Current Value: [ {{dsCurrent.dnsBypassIp}} ]</small>
<span ng-show="hasError(deliveryServiceForm.dnsBypassIp)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
</div>
@@ -336,7 +336,7 @@ under the License.
<div class="col-md-10 col-sm-10 col-xs-12">
<input name="dnsBypassIp6" type="text" class="form-control" ng-model="deliveryService.dnsBypassIp6" ng-maxlength="255" autofocus>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.dnsBypassIp6, 'maxlength')">Too Long</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.dnsBypassIp6 != dsOriginal.dnsBypassIp6">Current Value: [ {{dsOriginal.dnsBypassIp6}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.dnsBypassIp6 != dsCurrent.dnsBypassIp6">Current Value: [ {{dsCurrent.dnsBypassIp6}} ]</small>
<span ng-show="hasError(deliveryServiceForm.dnsBypassIp6)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
</div>
@@ -346,7 +346,7 @@ under the License.
<div class="col-md-10 col-sm-10 col-xs-12">
<input name="dnsBypassCname" type="text" class="form-control" ng-model="deliveryService.dnsBypassCname" ng-maxlength="255" autofocus>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.dnsBypassCname, 'maxlength')">Too Long</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.dnsBypassCname != dsOriginal.dnsBypassCname">Current Value: [ {{dsOriginal.dnsBypassCname}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.dnsBypassCname != dsCurrent.dnsBypassCname">Current Value: [ {{dsCurrent.dnsBypassCname}} ]</small>
<span ng-show="hasError(deliveryServiceForm.dnsBypassCname)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
</div>
@@ -356,7 +356,7 @@ under the License.
<div class="col-md-10 col-sm-10 col-xs-12">
<input name="dnsBypassTtl" type="number" class="form-control" ng-model="deliveryService.dnsBypassTtl" ng-pattern="/^\d+$/" autofocus>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.dnsBypassTtl, 'pattern')">Whole Number</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.dnsBypassTtl != dsOriginal.dnsBypassTtl">Current Value: [ {{dsOriginal.dnsBypassTtl}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.dnsBypassTtl != dsCurrent.dnsBypassTtl">Current Value: [ {{dsCurrent.dnsBypassTtl}} ]</small>
<span ng-show="hasError(deliveryServiceForm.dnsBypassTtl)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
</div>
@@ -366,7 +366,7 @@ under the License.
<div class="col-md-10 col-sm-10 col-xs-12">
<input name="maxDnsAnswers" type="number" class="form-control" placeholder="Max number of IP addresses in DNS answer (0 means all)" ng-model="deliveryService.maxDnsAnswers" ng-pattern="/^\d+$/" autofocus>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.maxDnsAnswers, 'pattern')">Whole Number</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.maxDnsAnswers != dsOriginal.maxDnsAnswers">Current Value: [ {{dsOriginal.maxDnsAnswers}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.maxDnsAnswers != dsCurrent.maxDnsAnswers">Current Value: [ {{dsCurrent.maxDnsAnswers}} ]</small>
<span ng-show="hasError(deliveryServiceForm.maxDnsAnswers)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
</div>
@@ -376,7 +376,7 @@ under the License.
<div class="col-md-10 col-sm-10 col-xs-12">
<input name="ccrDnsTtl" type="number" class="form-control" ng-model="deliveryService.ccrDnsTtl" ng-pattern="/^\d+$/" autofocus>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.ccrDnsTtl, 'pattern')">Whole Number</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.ccrDnsTtl != dsOriginal.ccrDnsTtl">Current Value: [ {{dsOriginal.ccrDnsTtl}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.ccrDnsTtl != dsCurrent.ccrDnsTtl">Current Value: [ {{dsCurrent.ccrDnsTtl}} ]</small>
<span ng-show="hasError(deliveryServiceForm.ccrDnsTtl)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
</div>
@@ -387,7 +387,7 @@ under the License.
<select name="profile" class="form-control" ng-model="deliveryService.profileId" ng-options="profile.id as profile.name for profile in profiles">
<option value="">Select...</option>
</select>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.profileId != dsOriginal.profileId">Current Value: [ {{dsOriginal.profileName}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.profileId != dsCurrent.profileId">Current Value: [ {{dsCurrent.profileName}} ]</small>
</div>
</div>
@@ -396,7 +396,7 @@ under the License.
<div class="col-md-10 col-sm-10 col-xs-12">
<input name="globalMaxMbps" type="number" class="form-control" placeholder="Max bits per second allowed globally" ng-model="deliveryService.globalMaxMbps" ng-pattern="/^\d+$/" autofocus>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.globalMaxMbps, 'pattern')">Whole Number</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.globalMaxMbps != dsOriginal.globalMaxMbps">Current Value: [ {{dsOriginal.globalMaxMbps}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.globalMaxMbps != dsCurrent.globalMaxMbps">Current Value: [ {{dsCurrent.globalMaxMbps}} ]</small>
<span ng-show="hasError(deliveryServiceForm.globalMaxMbps)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
</div>
@@ -406,7 +406,7 @@ under the License.
<div class="col-md-10 col-sm-10 col-xs-12">
<input name="globalMaxTps" type="number" class="form-control" placeholder="Max transactions per second allowed globally" ng-model="deliveryService.globalMaxTps" ng-pattern="/^\d+$/" autofocus>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.globalMaxTps, 'pattern')">Whole Number</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.globalMaxTps != dsOriginal.globalMaxTps">Current Value: [ {{dsOriginal.globalMaxTps}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.globalMaxTps != dsCurrent.globalMaxTps">Current Value: [ {{dsCurrent.globalMaxTps}} ]</small>
<span ng-show="hasError(deliveryServiceForm.globalMaxTps)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
</div>
@@ -416,7 +416,7 @@ under the License.
<div class="col-md-10 col-sm-10 col-xs-12">
<input name="edgeHeaderRewrite" type="text" class="form-control" ng-model="deliveryService.edgeHeaderRewrite" ng-maxlength="2048" autofocus>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.edgeHeaderRewrite, 'maxlength')">Too Long</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.edgeHeaderRewrite != dsOriginal.edgeHeaderRewrite">Current Value: [ {{dsOriginal.edgeHeaderRewrite}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.edgeHeaderRewrite != dsCurrent.edgeHeaderRewrite">Current Value: [ {{dsCurrent.edgeHeaderRewrite}} ]</small>
<span ng-show="hasError(deliveryServiceForm.edgeHeaderRewrite)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
</div>
@@ -426,7 +426,7 @@ under the License.
<div class="col-md-10 col-sm-10 col-xs-12">
<input name="midHeaderRewrite" type="text" class="form-control" ng-model="deliveryService.midHeaderRewrite" ng-maxlength="2048" autofocus>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.midHeaderRewrite, 'maxlength')">Too Long</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.midHeaderRewrite != dsOriginal.midHeaderRewrite">Current Value: [ {{dsOriginal.midHeaderRewrite}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.midHeaderRewrite != dsCurrent.midHeaderRewrite">Current Value: [ {{dsCurrent.midHeaderRewrite}} ]</small>
<span ng-show="hasError(deliveryServiceForm.midHeaderRewrite)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
</div>
@@ -436,7 +436,7 @@ under the License.
<div class="col-md-10 col-sm-10 col-xs-12">
<input name="trResponseHeaders" type="text" class="form-control" ng-model="deliveryService.trResponseHeaders" ng-maxlength="1024" autofocus>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.trResponseHeaders, 'maxlength')">Too Long</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.trResponseHeaders != dsOriginal.trResponseHeaders">Current Value: [ {{dsOriginal.trResponseHeaders}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.trResponseHeaders != dsCurrent.trResponseHeaders">Current Value: [ {{dsCurrent.trResponseHeaders}} ]</small>
<span ng-show="hasError(deliveryServiceForm.trResponseHeaders)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
</div>
@@ -446,7 +446,7 @@ under the License.
<div class="col-md-10 col-sm-10 col-xs-12">
<input name="trRequestHeaders" type="text" class="form-control" ng-model="deliveryService.trRequestHeaders" ng-maxlength="1024" autofocus>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.trRequestHeaders, 'maxlength')">Too Long</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.trRequestHeaders != dsOriginal.trRequestHeaders">Current Value: [ {{dsOriginal.trRequestHeaders}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.trRequestHeaders != dsCurrent.trRequestHeaders">Current Value: [ {{dsCurrent.trRequestHeaders}} ]</small>
<span ng-show="hasError(deliveryServiceForm.trRequestHeaders)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
</div>
@@ -456,7 +456,7 @@ under the License.
<div class="col-md-10 col-sm-10 col-xs-12">
<input name="regexRemap" type="text" class="form-control" ng-model="deliveryService.regexRemap" ng-maxlength="1024" autofocus>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.regexRemap, 'maxlength')">Too Long</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.regexRemap != dsOriginal.regexRemap">Current Value: [ {{dsOriginal.regexRemap}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.regexRemap != dsCurrent.regexRemap">Current Value: [ {{dsCurrent.regexRemap}} ]</small>
<span ng-show="hasError(deliveryServiceForm.regexRemap)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
</div>
@@ -466,7 +466,7 @@ under the License.
<div class="col-md-10 col-sm-10 col-xs-12">
<input name="cacheurl" type="text" class="form-control" ng-model="deliveryService.cacheurl" ng-maxlength="1024" autofocus>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.cacheurl, 'maxlength')">Too Long</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.cacheurl != dsOriginal.cacheurl">Current Value: [ {{dsOriginal.cacheurl}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.cacheurl != dsCurrent.cacheurl">Current Value: [ {{dsCurrent.cacheurl}} ]</small>
<span ng-show="hasError(deliveryServiceForm.cacheurl)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
</div>
@@ -476,7 +476,7 @@ under the License.
<div class="col-md-10 col-sm-10 col-xs-12">
<input name="remapText" type="text" class="form-control" ng-model="deliveryService.remapText" ng-maxlength="2048" autofocus>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.remapText, 'maxlength')">Too Long</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.remapText != dsOriginal.remapText">Current Value: [ {{dsOriginal.remapText}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.remapText != dsCurrent.remapText">Current Value: [ {{dsCurrent.remapText}} ]</small>
<span ng-show="hasError(deliveryServiceForm.remapText)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
</div>
@@ -486,7 +486,7 @@ under the License.
<div class="col-md-10 col-sm-10 col-xs-12">
<input name="longDesc1" type="text" class="form-control" ng-model="deliveryService.longDesc1" ng-maxlength="1024" autofocus>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.longDesc1, 'maxlength')">Too Long</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.longDesc1 != dsOriginal.longDesc1">Current Value: [ {{dsOriginal.longDesc1}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.longDesc1 != dsCurrent.longDesc1">Current Value: [ {{dsCurrent.longDesc1}} ]</small>
<span ng-show="hasError(deliveryServiceForm.longDesc1)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
</div>
@@ -496,7 +496,7 @@ under the License.
<div class="col-md-10 col-sm-10 col-xs-12">
<input name="longDesc2" type="text" class="form-control" ng-model="deliveryService.longDesc2" ng-maxlength="1024" autofocus>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.longDesc2, 'maxlength')">Too Long</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.longDesc2 != dsOriginal.longDesc2">Current Value: [ {{dsOriginal.longDesc2}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.longDesc2 != dsCurrent.longDesc2">Current Value: [ {{dsCurrent.longDesc2}} ]</small>
<span ng-show="hasError(deliveryServiceForm.longDesc2)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
</div>
@@ -506,7 +506,7 @@ under the License.
<div class="col-md-10 col-sm-10 col-xs-12">
<input name="infoUrl" type="text" class="form-control" ng-model="deliveryService.infoUrl" ng-maxlength="255" autofocus>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.infoUrl, 'maxlength')">Too Long</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.infoUrl != dsOriginal.infoUrl">Current Value: [ {{dsOriginal.infoUrl}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.infoUrl != dsCurrent.infoUrl">Current Value: [ {{dsCurrent.infoUrl}} ]</small>
<span ng-show="hasError(deliveryServiceForm.infoUrl)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
</div>
@@ -516,7 +516,7 @@ under the License.
<div class="col-md-10 col-sm-10 col-xs-12">
<input name="checkPath" type="text" class="form-control" ng-model="deliveryService.checkPath" ng-maxlength="255" autofocus>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.checkPath, 'maxlength')">Too Long</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.checkPath != dsOriginal.checkPath">Current Value: [ {{dsOriginal.checkPath}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.checkPath != dsCurrent.checkPath">Current Value: [ {{dsCurrent.checkPath}} ]</small>
<span ng-show="hasError(deliveryServiceForm.checkPath)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
</div>
@@ -526,7 +526,7 @@ under the License.
<div class="col-md-10 col-sm-10 col-xs-12">
<input name="originShield" type="text" class="form-control" ng-model="deliveryService.originShield" ng-maxlength="1024" autofocus>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.originShield, 'maxlength')">Too Long</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.originShield != dsOriginal.originShield">Current Value: [ {{dsOriginal.originShield}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.originShield != dsCurrent.originShield">Current Value: [ {{dsCurrent.originShield}} ]</small>
<span ng-show="hasError(deliveryServiceForm.originShield)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
</div>
@@ -535,9 +535,9 @@ under the License.
<div class="modal-footer">
<button class="btn btn-link" ng-click="advancedShowing = !advancedShowing"><span ng-show="!advancedShowing">Show</span><span ng-show="advancedShowing">Hide</span> Advanced</button>
- <button type="button" class="btn btn-danger" ng-if="!settings.isNew && !fulfill" ng-disabled="!deletable()" ng-click="confirmDelete(deliveryService)">{{settings.deleteLabel}}</button>
- <button type="button" class="btn btn-success" ng-if="!fulfill" ng-disabled="deliveryServiceForm.$pristine || deliveryServiceForm.$invalid || !saveable()" ng-click="save(deliveryService)">{{settings.saveLabel}}</button>
- <button type="button" class="btn btn-success" ng-if="settings.isRequest && fulfill" ng-disabled="deliveryServiceForm.$invalid" ng-click="fulfillRequest(deliveryService)">Fulfill Request</button>
+ <button type="button" class="btn btn-danger" ng-if="!settings.isNew" ng-disabled="!deletable()" ng-click="confirmDelete(deliveryService)">{{settings.deleteLabel}}</button>
+ <button type="button" class="btn btn-success" ng-disabled="deliveryServiceForm.$pristine || deliveryServiceForm.$invalid || !saveable()" ng-click="save(deliveryService)">{{settings.saveLabel}}</button>
+ <button type="button" class="btn btn-primary" ng-if="settings.isRequest && fulfillable()" ng-disabled="deliveryServiceForm.$invalid" ng-click="fulfillRequest(deliveryService)">Fulfill Request</button>
</div>
</form>
</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 17063d7..bcdf104 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
@@ -68,7 +68,7 @@ under the License.
<option value="">Select...</option>
</select>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.active, 'required')">Required</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.active != dsOriginal.active">Current Value: [ {{dsOriginal.active}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.active != dsCurrent.active">Current Value: [ {{dsCurrent.active}} ]</small>
</div>
</div>
@@ -79,7 +79,7 @@ under the License.
<option value="">Select...</option>
</select>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.type, 'required')">Required</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.typeId != dsOriginal.typeId">Current Value: [ {{dsOriginal.type}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.typeId != dsCurrent.typeId">Current Value: [ {{dsCurrent.type}} ]</small>
</div>
</div>
@@ -90,7 +90,7 @@ under the License.
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.xmlId, 'required')">Required</small>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.xmlId, 'maxlength')">Too Long</small>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.xmlId, 'pattern')">No spaces</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.xmlId != dsOriginal.xmlId">Current Value: [ {{dsOriginal.xmlId}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.xmlId != dsCurrent.xmlId">Current Value: [ {{dsCurrent.xmlId}} ]</small>
<span ng-show="hasError(deliveryServiceForm.xmlId)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
</div>
@@ -101,7 +101,7 @@ under the License.
<input name="displayName" type="text" class="form-control" ng-model="deliveryService.displayName" ng-maxlength="48" required autofocus>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.displayName, 'required')">Required</small>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.displayName, 'maxlength')">Too Long</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.displayName != dsOriginal.displayName">Current Value: [ {{dsOriginal.displayName}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.displayName != dsCurrent.displayName">Current Value: [ {{dsCurrent.displayName}} ]</small>
<span ng-show="hasError(deliveryServiceForm.displayName)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
</div>
@@ -113,7 +113,7 @@ under the License.
<option value="">Select...</option>
</select>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.tenantId, 'required')">Required</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.tenantId != dsOriginal.tenantId">Current Value: [ {{dsOriginal.tenant}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.tenantId != dsCurrent.tenantId">Current Value: [ {{dsCurrent.tenant}} ]</small>
</div>
</div>
@@ -124,7 +124,7 @@ under the License.
<option value="">Select...</option>
</select>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.cdn, 'required')">Required</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.cdnId != dsOriginal.cdnId">Current Value: [ {{dsOriginal.cdnName}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.cdnId != dsCurrent.cdnId">Current Value: [ {{dsCurrent.cdnName}} ]</small>
</div>
</div>
@@ -134,7 +134,7 @@ under the License.
<input name="orgServerFqdn" type="text" class="form-control" placeholder="http(s)//:" ng-model="deliveryService.orgServerFqdn" ng-pattern="/^(https?:\/\/)/" required autofocus>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.orgServerFqdn, 'required')">Required</small>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.orgServerFqdn, 'pattern')">Must start with http:// or https://</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.orgServerFqdn != dsOriginal.orgServerFqdn">Current Value: [ {{dsOriginal.orgServerFqdn}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.orgServerFqdn != dsCurrent.orgServerFqdn">Current Value: [ {{dsCurrent.orgServerFqdn}} ]</small>
<span ng-show="hasError(deliveryServiceForm.orgServerFqdn)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
</div>
@@ -146,7 +146,7 @@ under the License.
<option value="">Select...</option>
</select>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.protocol, 'required')">Required</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.protocol != dsOriginal.protocol">Current Value: [ {{magicNumberLabel(protocols, dsOriginal.protocol)}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.protocol != dsCurrent.protocol">Current Value: [ {{magicNumberLabel(protocols, dsCurrent.protocol)}} ]</small>
</div>
</div>
@@ -156,12 +156,12 @@ under the License.
<input name="longDesc" type="text" class="form-control" ng-model="deliveryService.longDesc" ng-maxlength="1024" autofocus required>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.longDesc, 'required')">Required</small>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.longDesc, 'maxlength')">Too Long</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.longDesc != dsOriginal.longDesc">Current Value: [ {{dsOriginal.longDesc}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.longDesc != dsCurrent.longDesc">Current Value: [ {{dsCurrent.longDesc}} ]</small>
<span ng-show="hasError(deliveryServiceForm.longDesc)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
</div>
- <div class="form-group" ng-if="!settings.isNew && deliveryService.exampleURLs.length > 0">
+ <div class="form-group" ng-if="!settings.isNew && !settings.isRequest">
<label class="control-label col-md-2 col-sm-2 col-xs-12">Delivery Service URLs</label>
<div class="col-md-10 col-sm-10 col-xs-12">
<textarea name="edgeFQDNs" rows="4" cols="17" class="form-control readonly" readonly>{{edgeFQDNs(deliveryService)}}</textarea>
@@ -178,7 +178,7 @@ under the License.
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.routingName, 'required')">Required</small>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.routingName, 'maxlength')">Too Long</small>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.routingName, 'pattern')">Invalid. Must be a valid hostname without periods</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.routingName != dsOriginal.routingName">Current Value: [ {{dsOriginal.routingName}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.routingName != dsCurrent.routingName">Current Value: [ {{dsCurrent.routingName}} ]</small>
<span ng-show="hasError(deliveryServiceForm.routingName)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
</div>
@@ -200,7 +200,7 @@ under the License.
<option value="">Select...</option>
</select>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.dscp, 'required')">Required</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.dscp != dsOriginal.dscp">Current Value: [ {{magicNumberLabel(dscps, dsOriginal.dscp)}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.dscp != dsCurrent.dscp">Current Value: [ {{magicNumberLabel(dscps, dsCurrent.dscp)}} ]</small>
</div>
</div>
@@ -211,7 +211,7 @@ under the License.
<option value="">Select...</option>
</select>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.ipv6RoutingEnabled, 'required')">Required</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.ipv6RoutingEnabled != dsOriginal.ipv6RoutingEnabled">Current Value: [ {{dsOriginal.ipv6RoutingEnabled}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.ipv6RoutingEnabled != dsCurrent.ipv6RoutingEnabled">Current Value: [ {{dsCurrent.ipv6RoutingEnabled}} ]</small>
</div>
</div>
@@ -222,7 +222,7 @@ under the License.
<option value="">Select...</option>
</select>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.rangeRequestHandling, 'required')">Required</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.rangeRequestHandling != dsOriginal.rangeRequestHandling">Current Value: [ {{magicNumberLabel(rrhs, dsOriginal.rangeRequestHandling)}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.rangeRequestHandling != dsCurrent.rangeRequestHandling">Current Value: [ {{magicNumberLabel(rrhs, dsCurrent.rangeRequestHandling)}} ]</small>
</div>
</div>
@@ -233,7 +233,7 @@ under the License.
<option value="">Select...</option>
</select>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.qstringIgnore, 'required')">Required</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.qstringIgnore != dsOriginal.qstringIgnore">Current Value: [ {{magicNumberLabel(qStrings, dsOriginal.qstringIgnore)}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.qstringIgnore != dsCurrent.qstringIgnore">Current Value: [ {{magicNumberLabel(qStrings, dsCurrent.qstringIgnore)}} ]</small>
</div>
</div>
@@ -244,7 +244,7 @@ under the License.
<option value="">Select...</option>
</select>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.multiSiteOrigin, 'required')">Required</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.multiSiteOrigin != dsOriginal.multiSiteOrigin">Current Value: [ {{dsOriginal.multiSiteOrigin}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.multiSiteOrigin != dsCurrent.multiSiteOrigin">Current Value: [ {{dsCurrent.multiSiteOrigin}} ]</small>
</div>
</div>
@@ -255,7 +255,7 @@ under the License.
<option value="">Select...</option>
</select>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.logsEnabled, 'required')">Required</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.logsEnabled != dsOriginal.logsEnabled">Current Value: [ {{dsOriginal.logsEnabled}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.logsEnabled != dsCurrent.logsEnabled">Current Value: [ {{dsCurrent.logsEnabled}} ]</small>
</div>
</div>
@@ -266,7 +266,7 @@ under the License.
<option value="">Select...</option>
</select>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.initialDispersion, 'required')">Required</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.initialDispersion != dsOriginal.initialDispersion">Current Value: [ {{magicNumberLabel(dispersions, dsOriginal.initialDispersion)}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.initialDispersion != dsCurrent.initialDispersion">Current Value: [ {{magicNumberLabel(dispersions, dsCurrent.initialDispersion)}} ]</small>
</div>
</div>
@@ -277,7 +277,7 @@ under the License.
<option value="">Select...</option>
</select>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.regionalGeoBlocking, 'required')">Required</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.regionalGeoBlocking != dsOriginal.regionalGeoBlocking">Current Value: [ {{dsOriginal.regionalGeoBlocking}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.regionalGeoBlocking != dsCurrent.regionalGeoBlocking">Current Value: [ {{dsCurrent.regionalGeoBlocking}} ]</small>
</div>
</div>
@@ -288,7 +288,7 @@ under the License.
<option value="">Select...</option>
</select>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.geoProvider, 'required')">Required</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.geoProvider != dsOriginal.geoProvider">Current Value: [ {{magicNumberLabel(geoProviders, dsOriginal.geoProvider)}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.geoProvider != dsCurrent.geoProvider">Current Value: [ {{magicNumberLabel(geoProviders, dsCurrent.geoProvider)}} ]</small>
</div>
</div>
@@ -297,7 +297,7 @@ under the License.
<div class="col-md-10 col-sm-10 col-xs-12">
<input name="missLat" type="number" class="form-control" ng-model="deliveryService.missLat" required autofocus>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.missLat, 'required')">Required</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.missLat != dsOriginal.missLat">Current Value: [ {{dsOriginal.missLat}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.missLat != dsCurrent.missLat">Current Value: [ {{dsCurrent.missLat}} ]</small>
<span ng-show="hasError(deliveryServiceForm.missLat)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
</div>
@@ -307,7 +307,7 @@ under the License.
<div class="col-md-10 col-sm-10 col-xs-12">
<input name="missLong" type="number" class="form-control" ng-model="deliveryService.missLong" required autofocus>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.missLong, 'required')">Required</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.missLong != dsOriginal.missLong">Current Value: [ {{dsOriginal.missLong}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.missLong != dsCurrent.missLong">Current Value: [ {{dsCurrent.missLong}} ]</small>
<span ng-show="hasError(deliveryServiceForm.missLong)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
</div>
@@ -319,7 +319,7 @@ under the License.
<option value="">Select...</option>
</select>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.geoLimit, 'required')">Required</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.geoLimit != dsOriginal.geoLimit">Current Value: [ {{magicNumberLabel(geoLimits, dsOriginal.geoLimit)}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.geoLimit != dsCurrent.geoLimit">Current Value: [ {{magicNumberLabel(geoLimits, dsCurrent.geoLimit)}} ]</small>
</div>
</div>
@@ -328,7 +328,7 @@ under the License.
<div class="col-md-10 col-sm-10 col-xs-12">
<input name="geoLimitCountries" type="text" class="form-control" ng-model="deliveryService.geoLimitCountries" ng-maxlength="255" autofocus>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.geoLimitCountries, 'maxlength')">Too Long</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.geoLimitCountries != dsOriginal.geoLimitCountries">Current Value: [ {{dsOriginal.geoLimitCountries}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.geoLimitCountries != dsCurrent.geoLimitCountries">Current Value: [ {{dsCurrent.geoLimitCountries}} ]</small>
<span ng-show="hasError(deliveryServiceForm.geoLimitCountries)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
</div>
@@ -338,7 +338,7 @@ under the License.
<div class="col-md-10 col-sm-10 col-xs-12">
<input name="geoLimitRedirectURL" type="text" class="form-control" ng-model="deliveryService.geoLimitRedirectURL" ng-pattern="/^(https?:\/\/)/" autofocus>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.geoLimitRedirectURL, 'pattern')">Must start with http:// or https://</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.geoLimitRedirectURL != dsOriginal.geoLimitRedirectURL">Current Value: [ {{dsOriginal.geoLimitRedirectURL}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.geoLimitRedirectURL != dsCurrent.geoLimitRedirectURL">Current Value: [ {{dsCurrent.geoLimitRedirectURL}} ]</small>
<span ng-show="hasError(deliveryServiceForm.geoLimitRedirectURL)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
</div>
@@ -349,7 +349,7 @@ under the License.
<select name="signingAlgorithm" class="form-control" ng-model="deliveryService.signingAlgorithm" ng-options="sa.value as sa.label for sa in signingAlgos">
<option value="">Select...</option>
</select>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.signingAlgorithm != dsOriginal.signingAlgorithm">Current Value: [ {{magicNumberLabel(signingAlgos, dsOriginal.signingAlgorithm)}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.signingAlgorithm != dsCurrent.signingAlgorithm">Current Value: [ {{magicNumberLabel(signingAlgos, dsCurrent.signingAlgorithm)}} ]</small>
</div>
</div>
@@ -358,7 +358,7 @@ under the License.
<div class="col-md-10 col-sm-10 col-xs-12">
<input name="httpBypassFqdn" type="text" class="form-control" ng-model="deliveryService.httpBypassFqdn" ng-pattern="/^(https?:\/\/)/" autofocus>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.httpBypassFqdn, 'pattern')">Must start with http:// or https://</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.httpBypassFqdn != dsOriginal.httpBypassFqdn">Current Value: [ {{dsOriginal.httpBypassFqdn}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.httpBypassFqdn != dsCurrent.httpBypassFqdn">Current Value: [ {{dsCurrent.httpBypassFqdn}} ]</small>
<span ng-show="hasError(deliveryServiceForm.httpBypassFqdn)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
</div>
@@ -368,7 +368,7 @@ under the License.
<div class="col-md-10 col-sm-10 col-xs-12">
<input name="dnsBypassTtl" type="number" class="form-control" ng-model="deliveryService.dnsBypassTtl" ng-pattern="/^\d+$/" autofocus>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.dnsBypassTtl, 'pattern')">Whole Number</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.dnsBypassTtl != dsOriginal.dnsBypassTtl">Current Value: [ {{dsOriginal.dnsBypassTtl}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.dnsBypassTtl != dsCurrent.dnsBypassTtl">Current Value: [ {{dsCurrent.dnsBypassTtl}} ]</small>
<span ng-show="hasError(deliveryServiceForm.dnsBypassTtl)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
</div>
@@ -378,7 +378,7 @@ under the License.
<div class="col-md-10 col-sm-10 col-xs-12">
<input name="ccrDnsTtl" type="number" class="form-control" ng-model="deliveryService.ccrDnsTtl" ng-pattern="/^\d+$/" autofocus>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.ccrDnsTtl, 'pattern')">Whole Number</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.ccrDnsTtl != dsOriginal.ccrDnsTtl">Current Value: [ {{dsOriginal.ccrDnsTtl}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.ccrDnsTtl != dsCurrent.ccrDnsTtl">Current Value: [ {{dsCurrent.ccrDnsTtl}} ]</small>
<span ng-show="hasError(deliveryServiceForm.ccrDnsTtl)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
</div>
@@ -389,7 +389,7 @@ under the License.
<select name="profile" class="form-control" ng-model="deliveryService.profileId" ng-options="profile.id as profile.name for profile in profiles">
<option value="">Select...</option>
</select>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.profileId != dsOriginal.profileId">Current Value: [ {{dsOriginal.profileName}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.profileId != dsCurrent.profileId">Current Value: [ {{dsCurrent.profileName}} ]</small>
</div>
</div>
@@ -398,7 +398,7 @@ under the License.
<div class="col-md-10 col-sm-10 col-xs-12">
<input name="globalMaxMbps" type="number" class="form-control" placeholder="Max bits per second allowed globally" ng-model="deliveryService.globalMaxMbps" ng-pattern="/^\d+$/" autofocus>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.globalMaxMbps, 'pattern')">Whole Number</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.globalMaxMbps != dsOriginal.globalMaxMbps">Current Value: [ {{dsOriginal.globalMaxMbps}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.globalMaxMbps != dsCurrent.globalMaxMbps">Current Value: [ {{dsCurrent.globalMaxMbps}} ]</small>
<span ng-show="hasError(deliveryServiceForm.globalMaxMbps)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
</div>
@@ -408,7 +408,7 @@ under the License.
<div class="col-md-10 col-sm-10 col-xs-12">
<input name="globalMaxTps" type="number" class="form-control" placeholder="Max transactions per second allowed globally" ng-model="deliveryService.globalMaxTps" ng-pattern="/^\d+$/" autofocus>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.globalMaxTps, 'pattern')">Whole Number</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.globalMaxTps != dsOriginal.globalMaxTps">Current Value: [ {{dsOriginal.globalMaxTps}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.globalMaxTps != dsCurrent.globalMaxTps">Current Value: [ {{dsCurrent.globalMaxTps}} ]</small>
<span ng-show="hasError(deliveryServiceForm.globalMaxTps)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
</div>
@@ -418,7 +418,7 @@ under the License.
<div class="col-md-10 col-sm-10 col-xs-12">
<input name="edgeHeaderRewrite" type="text" class="form-control" ng-model="deliveryService.edgeHeaderRewrite" ng-maxlength="2048" autofocus>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.edgeHeaderRewrite, 'maxlength')">Too Long</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.edgeHeaderRewrite != dsOriginal.edgeHeaderRewrite">Current Value: [ {{dsOriginal.edgeHeaderRewrite}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.edgeHeaderRewrite != dsCurrent.edgeHeaderRewrite">Current Value: [ {{dsCurrent.edgeHeaderRewrite}} ]</small>
<span ng-show="hasError(deliveryServiceForm.edgeHeaderRewrite)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
</div>
@@ -428,7 +428,7 @@ under the License.
<div class="col-md-10 col-sm-10 col-xs-12">
<input name="midHeaderRewrite" type="text" class="form-control" ng-model="deliveryService.midHeaderRewrite" ng-maxlength="2048" autofocus>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.midHeaderRewrite, 'maxlength')">Too Long</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.midHeaderRewrite != dsOriginal.midHeaderRewrite">Current Value: [ {{dsOriginal.midHeaderRewrite}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.midHeaderRewrite != dsCurrent.midHeaderRewrite">Current Value: [ {{dsCurrent.midHeaderRewrite}} ]</small>
<span ng-show="hasError(deliveryServiceForm.midHeaderRewrite)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
</div>
@@ -438,7 +438,7 @@ under the License.
<div class="col-md-10 col-sm-10 col-xs-12">
<input name="trResponseHeaders" type="text" class="form-control" ng-model="deliveryService.trResponseHeaders" ng-maxlength="1024" autofocus>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.trResponseHeaders, 'maxlength')">Too Long</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.trResponseHeaders != dsOriginal.trResponseHeaders">Current Value: [ {{dsOriginal.trResponseHeaders}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.trResponseHeaders != dsCurrent.trResponseHeaders">Current Value: [ {{dsCurrent.trResponseHeaders}} ]</small>
<span ng-show="hasError(deliveryServiceForm.trResponseHeaders)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
</div>
@@ -448,7 +448,7 @@ under the License.
<div class="col-md-10 col-sm-10 col-xs-12">
<input name="trRequestHeaders" type="text" class="form-control" ng-model="deliveryService.trRequestHeaders" ng-maxlength="1024" autofocus>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.trRequestHeaders, 'maxlength')">Too Long</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.trRequestHeaders != dsOriginal.trRequestHeaders">Current Value: [ {{dsOriginal.trRequestHeaders}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.trRequestHeaders != dsCurrent.trRequestHeaders">Current Value: [ {{dsCurrent.trRequestHeaders}} ]</small>
<span ng-show="hasError(deliveryServiceForm.trRequestHeaders)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
</div>
@@ -458,7 +458,7 @@ under the License.
<div class="col-md-10 col-sm-10 col-xs-12">
<input name="regexRemap" type="text" class="form-control" ng-model="deliveryService.regexRemap" ng-maxlength="1024" autofocus>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.regexRemap, 'maxlength')">Too Long</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.regexRemap != dsOriginal.regexRemap">Current Value: [ {{dsOriginal.regexRemap}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.regexRemap != dsCurrent.regexRemap">Current Value: [ {{dsCurrent.regexRemap}} ]</small>
<span ng-show="hasError(deliveryServiceForm.regexRemap)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
</div>
@@ -468,7 +468,7 @@ under the License.
<div class="col-md-10 col-sm-10 col-xs-12">
<input name="cacheurl" type="text" class="form-control" ng-model="deliveryService.cacheurl" ng-maxlength="1024" autofocus>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.cacheurl, 'maxlength')">Too Long</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.cacheurl != dsOriginal.cacheurl">Current Value: [ {{dsOriginal.cacheurl}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.cacheurl != dsCurrent.cacheurl">Current Value: [ {{dsCurrent.cacheurl}} ]</small>
<span ng-show="hasError(deliveryServiceForm.cacheurl)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
</div>
@@ -478,7 +478,7 @@ under the License.
<div class="col-md-10 col-sm-10 col-xs-12">
<input name="remapText" type="text" class="form-control" ng-model="deliveryService.remapText" ng-maxlength="2048" autofocus>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.remapText, 'maxlength')">Too Long</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.remapText != dsOriginal.remapText">Current Value: [ {{dsOriginal.remapText}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.remapText != dsCurrent.remapText">Current Value: [ {{dsCurrent.remapText}} ]</small>
<span ng-show="hasError(deliveryServiceForm.remapText)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
</div>
@@ -488,7 +488,7 @@ under the License.
<div class="col-md-10 col-sm-10 col-xs-12">
<input name="longDesc1" type="text" class="form-control" ng-model="deliveryService.longDesc1" ng-maxlength="1024" autofocus>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.longDesc1, 'maxlength')">Too Long</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.longDesc1 != dsOriginal.longDesc1">Current Value: [ {{dsOriginal.longDesc1}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.longDesc1 != dsCurrent.longDesc1">Current Value: [ {{dsCurrent.longDesc1}} ]</small>
<span ng-show="hasError(deliveryServiceForm.longDesc1)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
</div>
@@ -498,7 +498,7 @@ under the License.
<div class="col-md-10 col-sm-10 col-xs-12">
<input name="longDesc2" type="text" class="form-control" ng-model="deliveryService.longDesc2" ng-maxlength="1024" autofocus>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.longDesc2, 'maxlength')">Too Long</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.longDesc2 != dsOriginal.longDesc2">Current Value: [ {{dsOriginal.longDesc2}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.longDesc2 != dsCurrent.longDesc2">Current Value: [ {{dsCurrent.longDesc2}} ]</small>
<span ng-show="hasError(deliveryServiceForm.longDesc2)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
</div>
@@ -508,7 +508,7 @@ under the License.
<div class="col-md-10 col-sm-10 col-xs-12">
<input name="infoUrl" type="text" class="form-control" ng-model="deliveryService.infoUrl" ng-maxlength="255" autofocus>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.infoUrl, 'maxlength')">Too Long</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.infoUrl != dsOriginal.infoUrl">Current Value: [ {{dsOriginal.infoUrl}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.infoUrl != dsCurrent.infoUrl">Current Value: [ {{dsCurrent.infoUrl}} ]</small>
<span ng-show="hasError(deliveryServiceForm.infoUrl)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
</div>
@@ -518,7 +518,7 @@ under the License.
<div class="col-md-10 col-sm-10 col-xs-12">
<input name="checkPath" type="text" class="form-control" ng-model="deliveryService.checkPath" ng-maxlength="255" autofocus>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.checkPath, 'maxlength')">Too Long</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.checkPath != dsOriginal.checkPath">Current Value: [ {{dsOriginal.checkPath}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.checkPath != dsCurrent.checkPath">Current Value: [ {{dsCurrent.checkPath}} ]</small>
<span ng-show="hasError(deliveryServiceForm.checkPath)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
</div>
@@ -528,7 +528,7 @@ under the License.
<div class="col-md-10 col-sm-10 col-xs-12">
<input name="originShield" type="text" class="form-control" ng-model="deliveryService.originShield" ng-maxlength="1024" autofocus>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.originShield, 'maxlength')">Too Long</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.originShield != dsOriginal.originShield">Current Value: [ {{dsOriginal.originShield}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.originShield != dsCurrent.originShield">Current Value: [ {{dsCurrent.originShield}} ]</small>
<span ng-show="hasError(deliveryServiceForm.originShield)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
</div>
@@ -537,9 +537,9 @@ under the License.
<div class="modal-footer">
<button class="btn btn-link" ng-click="advancedShowing = !advancedShowing"><span ng-show="!advancedShowing">Show</span><span ng-show="advancedShowing">Hide</span> Advanced</button>
- <button type="button" class="btn btn-danger" ng-if="!settings.isNew && !fulfill" ng-disabled="!deletable()" ng-click="confirmDelete(deliveryService)">{{settings.deleteLabel}}</button>
- <button type="button" class="btn btn-success" ng-if="!fulfill" ng-disabled="deliveryServiceForm.$pristine || deliveryServiceForm.$invalid || !saveable()" ng-click="save(deliveryService)">{{settings.saveLabel}}</button>
- <button type="button" class="btn btn-success" ng-if="settings.isRequest && fulfill" ng-disabled="deliveryServiceForm.$invalid" ng-click="fulfillRequest(deliveryService)">Fulfill Request</button>
+ <button type="button" class="btn btn-danger" ng-if="!settings.isNew" ng-disabled="!deletable()" ng-click="confirmDelete(deliveryService)">{{settings.deleteLabel}}</button>
+ <button type="button" class="btn btn-success" ng-disabled="deliveryServiceForm.$pristine || deliveryServiceForm.$invalid || !saveable()" ng-click="save(deliveryService)">{{settings.saveLabel}}</button>
+ <button type="button" class="btn btn-primary" ng-if="settings.isRequest && fulfillable()" ng-disabled="deliveryServiceForm.$invalid" ng-click="fulfillRequest(deliveryService)">Fulfill Request</button>
</div>
</form>
</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 b4d495d..bf0a520 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
@@ -68,7 +68,7 @@ under the License.
<option value="">Select...</option>
</select>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.active, 'required')">Required</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.active != dsOriginal.active">Current Value: [ {{dsOriginal.active}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.active != dsCurrent.active">Current Value: [ {{dsCurrent.active}} ]</small>
</div>
</div>
@@ -79,7 +79,7 @@ under the License.
<option value="">Select...</option>
</select>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.type, 'required')">Required</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.typeId != dsOriginal.typeId">Current Value: [ {{dsOriginal.type}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.typeId != dsCurrent.typeId">Current Value: [ {{dsCurrent.type}} ]</small>
</div>
</div>
@@ -90,7 +90,7 @@ under the License.
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.xmlId, 'required')">Required</small>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.xmlId, 'maxlength')">Too Long</small>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.xmlId, 'pattern')">No spaces</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.xmlId != dsOriginal.xmlId">Current Value: [ {{dsOriginal.xmlId}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.xmlId != dsCurrent.xmlId">Current Value: [ {{dsCurrent.xmlId}} ]</small>
<span ng-show="hasError(deliveryServiceForm.xmlId)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
</div>
@@ -101,7 +101,7 @@ under the License.
<input name="displayName" type="text" class="form-control" ng-model="deliveryService.displayName" ng-maxlength="48" required autofocus>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.displayName, 'required')">Required</small>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.displayName, 'maxlength')">Too Long</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.displayName != dsOriginal.displayName">Current Value: [ {{dsOriginal.displayName}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.displayName != dsCurrent.displayName">Current Value: [ {{dsCurrent.displayName}} ]</small>
<span ng-show="hasError(deliveryServiceForm.displayName)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
</div>
@@ -113,7 +113,7 @@ under the License.
<option value="">Select...</option>
</select>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.tenantId, 'required')">Required</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.tenantId != dsOriginal.tenantId">Current Value: [ {{dsOriginal.tenant}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.tenantId != dsCurrent.tenantId">Current Value: [ {{dsCurrent.tenant}} ]</small>
</div>
</div>
@@ -124,7 +124,7 @@ under the License.
<option value="">Select...</option>
</select>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.cdn, 'required')">Required</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.cdnId != dsOriginal.cdnId">Current Value: [ {{dsOriginal.cdnName}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.cdnId != dsCurrent.cdnId">Current Value: [ {{dsCurrent.cdnName}} ]</small>
</div>
</div>
@@ -135,7 +135,7 @@ under the License.
<option value="">Select...</option>
</select>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.protocol, 'required')">Required</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.protocol != dsOriginal.protocol">Current Value: [ {{magicNumberLabel(protocols, dsOriginal.protocol)}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.protocol != dsCurrent.protocol">Current Value: [ {{magicNumberLabel(protocols, dsCurrent.protocol)}} ]</small>
</div>
</div>
@@ -145,12 +145,12 @@ under the License.
<input name="longDesc" type="text" class="form-control" ng-model="deliveryService.longDesc" ng-maxlength="1024" autofocus required>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.longDesc, 'required')">Required</small>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.longDesc, 'maxlength')">Too Long</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.longDesc != dsOriginal.longDesc">Current Value: [ {{dsOriginal.longDesc}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.longDesc != dsCurrent.longDesc">Current Value: [ {{dsCurrent.longDesc}} ]</small>
<span ng-show="hasError(deliveryServiceForm.longDesc)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
</div>
- <div class="form-group" ng-if="!settings.isNew && deliveryService.exampleURLs.length > 0">
+ <div class="form-group" ng-if="!settings.isNew && !settings.isRequest">
<label class="control-label col-md-2 col-sm-2 col-xs-12">Delivery Service URLs</label>
<div class="col-md-10 col-sm-10 col-xs-12">
<textarea name="edgeFQDNs" rows="4" cols="17" class="form-control readonly" readonly>{{edgeFQDNs(deliveryService)}}</textarea>
@@ -167,7 +167,7 @@ under the License.
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.routingName, 'required')">Required</small>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.routingName, 'maxlength')">Too Long</small>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.routingName, 'pattern')">Invalid. Must be a valid hostname without periods</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.routingName != dsOriginal.routingName">Current Value: [ {{dsOriginal.routingName}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.routingName != dsCurrent.routingName">Current Value: [ {{dsCurrent.routingName}} ]</small>
<span ng-show="hasError(deliveryServiceForm.routingName)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
</div>
@@ -179,7 +179,7 @@ under the License.
<option value="">Select...</option>
</select>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.ipv6RoutingEnabled, 'required')">Required</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.ipv6RoutingEnabled != dsOriginal.ipv6RoutingEnabled">Current Value: [ {{dsOriginal.ipv6RoutingEnabled}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.ipv6RoutingEnabled != dsCurrent.ipv6RoutingEnabled">Current Value: [ {{dsCurrent.ipv6RoutingEnabled}} ]</small>
</div>
</div>
@@ -190,7 +190,7 @@ under the License.
<option value="">Select...</option>
</select>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.logsEnabled, 'required')">Required</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.logsEnabled != dsOriginal.logsEnabled">Current Value: [ {{dsOriginal.logsEnabled}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.logsEnabled != dsCurrent.logsEnabled">Current Value: [ {{dsCurrent.logsEnabled}} ]</small>
</div>
</div>
@@ -201,7 +201,7 @@ under the License.
<option value="">Select...</option>
</select>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.geoProvider, 'required')">Required</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.geoProvider != dsOriginal.geoProvider">Current Value: [ {{magicNumberLabel(geoProviders, dsOriginal.geoProvider)}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.geoProvider != dsCurrent.geoProvider">Current Value: [ {{magicNumberLabel(geoProviders, dsCurrent.geoProvider)}} ]</small>
</div>
</div>
@@ -212,7 +212,7 @@ under the License.
<option value="">Select...</option>
</select>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.geoLimit, 'required')">Required</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.geoLimit != dsOriginal.geoLimit">Current Value: [ {{magicNumberLabel(geoLimits, dsOriginal.geoLimit)}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.geoLimit != dsCurrent.geoLimit">Current Value: [ {{magicNumberLabel(geoLimits, dsCurrent.geoLimit)}} ]</small>
</div>
</div>
@@ -221,7 +221,7 @@ under the License.
<div class="col-md-10 col-sm-10 col-xs-12">
<input name="geoLimitCountries" type="text" class="form-control" ng-model="deliveryService.geoLimitCountries" ng-maxlength="255" autofocus>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.geoLimitCountries, 'maxlength')">Too Long</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.geoLimitCountries != dsOriginal.geoLimitCountries">Current Value: [ {{dsOriginal.geoLimitCountries}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.geoLimitCountries != dsCurrent.geoLimitCountries">Current Value: [ {{dsCurrent.geoLimitCountries}} ]</small>
<span ng-show="hasError(deliveryServiceForm.geoLimitCountries)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
</div>
@@ -232,7 +232,7 @@ under the License.
<select name="profile" class="form-control" ng-model="deliveryService.profileId" ng-options="profile.id as profile.name for profile in profiles">
<option value="">Select...</option>
</select>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.profileId != dsOriginal.profileId">Current Value: [ {{dsOriginal.profileName}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.profileId != dsCurrent.profileId">Current Value: [ {{dsCurrent.profileName}} ]</small>
</div>
</div>
@@ -251,7 +251,7 @@ under the License.
<div class="col-md-10 col-sm-10 col-xs-12">
<input name="ccrDnsTtl" type="number" class="form-control" ng-model="deliveryService.ccrDnsTtl" ng-pattern="/^\d+$/" autofocus>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.ccrDnsTtl, 'pattern')">Whole Number</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.ccrDnsTtl != dsOriginal.ccrDnsTtl">Current Value: [ {{dsOriginal.ccrDnsTtl}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.ccrDnsTtl != dsCurrent.ccrDnsTtl">Current Value: [ {{dsCurrent.ccrDnsTtl}} ]</small>
<span ng-show="hasError(deliveryServiceForm.ccrDnsTtl)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
</div>
@@ -261,7 +261,7 @@ under the License.
<div class="col-md-10 col-sm-10 col-xs-12">
<input name="longDesc1" type="text" class="form-control" ng-model="deliveryService.longDesc1" ng-maxlength="1024" autofocus>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.longDesc1, 'maxlength')">Too Long</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.longDesc1 != dsOriginal.longDesc1">Current Value: [ {{dsOriginal.longDesc1}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.longDesc1 != dsCurrent.longDesc1">Current Value: [ {{dsCurrent.longDesc1}} ]</small>
<span ng-show="hasError(deliveryServiceForm.longDesc1)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
</div>
@@ -271,7 +271,7 @@ under the License.
<div class="col-md-10 col-sm-10 col-xs-12">
<input name="longDesc2" type="text" class="form-control" ng-model="deliveryService.longDesc2" ng-maxlength="1024" autofocus>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.longDesc2, 'maxlength')">Too Long</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.longDesc2 != dsOriginal.longDesc2">Current Value: [ {{dsOriginal.longDesc2}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.longDesc2 != dsCurrent.longDesc2">Current Value: [ {{dsCurrent.longDesc2}} ]</small>
<span ng-show="hasError(deliveryServiceForm.longDesc2)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
</div>
@@ -281,7 +281,7 @@ under the License.
<div class="col-md-10 col-sm-10 col-xs-12">
<input name="infoUrl" type="text" class="form-control" ng-model="deliveryService.infoUrl" ng-maxlength="255" autofocus>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.infoUrl, 'maxlength')">Too Long</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.infoUrl != dsOriginal.infoUrl">Current Value: [ {{dsOriginal.infoUrl}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.infoUrl != dsCurrent.infoUrl">Current Value: [ {{dsCurrent.infoUrl}} ]</small>
<span ng-show="hasError(deliveryServiceForm.infoUrl)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
</div>
@@ -291,7 +291,7 @@ under the License.
<div class="col-md-10 col-sm-10 col-xs-12">
<input name="checkPath" type="text" class="form-control" ng-model="deliveryService.checkPath" ng-maxlength="255" autofocus>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.checkPath, 'maxlength')">Too Long</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.checkPath != dsOriginal.checkPath">Current Value: [ {{dsOriginal.checkPath}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.checkPath != dsCurrent.checkPath">Current Value: [ {{dsCurrent.checkPath}} ]</small>
<span ng-show="hasError(deliveryServiceForm.checkPath)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
</div>
@@ -300,9 +300,9 @@ under the License.
<div class="modal-footer">
<button class="btn btn-link" ng-click="advancedShowing = !advancedShowing"><span ng-show="!advancedShowing">Show</span><span ng-show="advancedShowing">Hide</span> Advanced</button>
- <button type="button" class="btn btn-danger" ng-if="!settings.isNew && !fulfill" ng-disabled="!deletable()" ng-click="confirmDelete(deliveryService)">{{settings.deleteLabel}}</button>
- <button type="button" class="btn btn-success" ng-if="!fulfill" ng-disabled="deliveryServiceForm.$pristine || deliveryServiceForm.$invalid || !saveable()" ng-click="save(deliveryService)">{{settings.saveLabel}}</button>
- <button type="button" class="btn btn-success" ng-if="settings.isRequest && fulfill" ng-disabled="deliveryServiceForm.$invalid" ng-click="fulfillRequest(deliveryService)">Fulfill Request</button>
+ <button type="button" class="btn btn-danger" ng-if="!settings.isNew" ng-disabled="!deletable()" ng-click="confirmDelete(deliveryService)">{{settings.deleteLabel}}</button>
+ <button type="button" class="btn btn-success" ng-disabled="deliveryServiceForm.$pristine || deliveryServiceForm.$invalid || !saveable()" ng-click="save(deliveryService)">{{settings.saveLabel}}</button>
+ <button type="button" class="btn btn-primary" ng-if="settings.isRequest && fulfillable()" ng-disabled="deliveryServiceForm.$invalid" ng-click="fulfillRequest(deliveryService)">Fulfill Request</button>
</div>
</form>
</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 8c81c9c..3c23228 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
@@ -68,7 +68,7 @@ under the License.
<option value="">Select...</option>
</select>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.active, 'required')">Required</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.active != dsOriginal.active">Current Value: [ {{dsOriginal.active}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.active != dsCurrent.active">Current Value: [ {{dsCurrent.active}} ]</small>
</div>
</div>
@@ -79,7 +79,7 @@ under the License.
<option value="">Select...</option>
</select>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.type, 'required')">Required</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.typeId != dsOriginal.typeId">Current Value: [ {{dsOriginal.type}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.typeId != dsCurrent.typeId">Current Value: [ {{dsCurrent.type}} ]</small>
</div>
</div>
@@ -90,7 +90,7 @@ under the License.
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.xmlId, 'required')">Required</small>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.xmlId, 'maxlength')">Too Long</small>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.xmlId, 'pattern')">No spaces</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.xmlId != dsOriginal.xmlId">Current Value: [ {{dsOriginal.xmlId}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.xmlId != dsCurrent.xmlId">Current Value: [ {{dsCurrent.xmlId}} ]</small>
<span ng-show="hasError(deliveryServiceForm.xmlId)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
</div>
@@ -101,7 +101,7 @@ under the License.
<input name="displayName" type="text" class="form-control" ng-model="deliveryService.displayName" ng-maxlength="48" required autofocus>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.displayName, 'required')">Required</small>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.displayName, 'maxlength')">Too Long</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.displayName != dsOriginal.displayName">Current Value: [ {{dsOriginal.displayName}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.displayName != dsCurrent.displayName">Current Value: [ {{dsCurrent.displayName}} ]</small>
<span ng-show="hasError(deliveryServiceForm.displayName)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
</div>
@@ -113,7 +113,7 @@ under the License.
<option value="">Select...</option>
</select>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.tenantId, 'required')">Required</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.tenantId != dsOriginal.tenantId">Current Value: [ {{dsOriginal.tenant}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.tenantId != dsCurrent.tenantId">Current Value: [ {{dsCurrent.tenant}} ]</small>
</div>
</div>
@@ -124,7 +124,7 @@ under the License.
<option value="">Select...</option>
</select>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.cdn, 'required')">Required</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.cdnId != dsOriginal.cdnId">Current Value: [ {{dsOriginal.cdnName}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.cdnId != dsCurrent.cdnId">Current Value: [ {{dsCurrent.cdnName}} ]</small>
</div>
</div>
@@ -134,12 +134,12 @@ under the License.
<input name="longDesc" type="text" class="form-control" ng-model="deliveryService.longDesc" ng-maxlength="1024" autofocus required>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.longDesc, 'required')">Required</small>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.longDesc, 'maxlength')">Too Long</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.longDesc != dsOriginal.longDesc">Current Value: [ {{dsOriginal.longDesc}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.longDesc != dsCurrent.longDesc">Current Value: [ {{dsCurrent.longDesc}} ]</small>
<span ng-show="hasError(deliveryServiceForm.longDesc)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
</div>
- <div class="form-group" ng-if="!settings.isNew && deliveryService.exampleURLs.length > 0">
+ <div class="form-group" ng-if="!settings.isNew && !settings.isRequest">
<label class="control-label col-md-2 col-sm-2 col-xs-12">Delivery Service URLs</label>
<div class="col-md-10 col-sm-10 col-xs-12">
<textarea name="edgeFQDNs" rows="4" cols="17" class="form-control readonly" readonly>{{edgeFQDNs(deliveryService)}}</textarea>
@@ -155,7 +155,7 @@ under the License.
<option value="">Select...</option>
</select>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.regionalGeoBlocking, 'required')">Required</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.regionalGeoBlocking != dsOriginal.regionalGeoBlocking">Current Value: [ {{dsOriginal.regionalGeoBlocking}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.regionalGeoBlocking != dsCurrent.regionalGeoBlocking">Current Value: [ {{dsCurrent.regionalGeoBlocking}} ]</small>
</div>
</div>
@@ -166,7 +166,7 @@ under the License.
<option value="">Select...</option>
</select>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.logsEnabled, 'required')">Required</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.logsEnabled != dsOriginal.logsEnabled">Current Value: [ {{dsOriginal.logsEnabled}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.logsEnabled != dsCurrent.logsEnabled">Current Value: [ {{dsCurrent.logsEnabled}} ]</small>
</div>
</div>
@@ -175,7 +175,7 @@ under the License.
<div class="col-md-10 col-sm-10 col-xs-12">
<select name="geoProvider" class="form-control" ng-model="deliveryService.geoProvider" ng-options="gp.value as gp.label for gp in geoProviders" required></select>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.geoProvider, 'required')">Required</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.geoProvider != dsOriginal.geoProvider">Current Value: [ {{magicNumberLabel(geoProviders, dsOriginal.geoProvider)}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.geoProvider != dsCurrent.geoProvider">Current Value: [ {{magicNumberLabel(geoProviders, dsCurrent.geoProvider)}} ]</small>
</div>
</div>
@@ -186,7 +186,7 @@ under the License.
<option value="">Select...</option>
</select>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.geoLimit, 'required')">Required</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.geoLimit != dsOriginal.geoLimit">Current Value: [ {{magicNumberLabel(geoLimits, dsOriginal.geoLimit)}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.geoLimit != dsCurrent.geoLimit">Current Value: [ {{magicNumberLabel(geoLimits, dsCurrent.geoLimit)}} ]</small>
</div>
</div>
@@ -195,7 +195,7 @@ under the License.
<div class="col-md-10 col-sm-10 col-xs-12">
<input name="geoLimitCountries" type="text" class="form-control" ng-model="deliveryService.geoLimitCountries" ng-maxlength="255" autofocus>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.geoLimitCountries, 'maxlength')">Too Long</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.geoLimitCountries != dsOriginal.geoLimitCountries">Current Value: [ {{dsOriginal.geoLimitCountries}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.geoLimitCountries != dsCurrent.geoLimitCountries">Current Value: [ {{dsCurrent.geoLimitCountries}} ]</small>
<span ng-show="hasError(deliveryServiceForm.geoLimitCountries)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
</div>
@@ -205,7 +205,7 @@ under the License.
<div class="col-md-10 col-sm-10 col-xs-12">
<input name="geoLimitRedirectURL" type="text" class="form-control" ng-model="deliveryService.geoLimitRedirectURL" ng-pattern="/^(https?:\/\/)/" autofocus>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.geoLimitRedirectURL, 'pattern')">Must start with http:// or https://</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.geoLimitRedirectURL != dsOriginal.geoLimitRedirectURL">Current Value: [ {{dsOriginal.geoLimitRedirectURL}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.geoLimitRedirectURL != dsCurrent.geoLimitRedirectURL">Current Value: [ {{dsCurrent.geoLimitRedirectURL}} ]</small>
<span ng-show="hasError(deliveryServiceForm.geoLimitRedirectURL)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
</div>
@@ -216,7 +216,7 @@ under the License.
<select name="profile" class="form-control" ng-model="deliveryService.profileId" ng-options="profile.id as profile.name for profile in profiles">
<option value="">Select...</option>
</select>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.profileId != dsOriginal.profileId">Current Value: [ {{dsOriginal.profileName}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.profileId != dsCurrent.profileId">Current Value: [ {{dsCurrent.profileName}} ]</small>
</div>
</div>
@@ -225,7 +225,7 @@ under the License.
<div class="col-md-10 col-sm-10 col-xs-12">
<input name="trRequestHeaders" type="text" class="form-control" ng-model="deliveryService.trRequestHeaders" ng-maxlength="1024" autofocus>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.trRequestHeaders, 'maxlength')">Too Long</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.trRequestHeaders != dsOriginal.trRequestHeaders">Current Value: [ {{dsOriginal.trRequestHeaders}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.trRequestHeaders != dsCurrent.trRequestHeaders">Current Value: [ {{dsCurrent.trRequestHeaders}} ]</small>
<span ng-show="hasError(deliveryServiceForm.trRequestHeaders)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
</div>
@@ -235,7 +235,7 @@ under the License.
<div class="col-md-10 col-sm-10 col-xs-12">
<input name="cacheurl" type="text" class="form-control" ng-model="deliveryService.cacheurl" ng-maxlength="1024" autofocus>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.cacheurl, 'maxlength')">Too Long</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.cacheurl != dsOriginal.cacheurl">Current Value: [ {{dsOriginal.cacheurl}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.cacheurl != dsCurrent.cacheurl">Current Value: [ {{dsCurrent.cacheurl}} ]</small>
<span ng-show="hasError(deliveryServiceForm.cacheurl)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
</div>
@@ -245,7 +245,7 @@ under the License.
<div class="col-md-10 col-sm-10 col-xs-12">
<input name="ccrDnsTtl" type="number" class="form-control" ng-model="deliveryService.ccrDnsTtl" ng-pattern="/^\d+$/" autofocus>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.ccrDnsTtl, 'pattern')">Whole Number</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.ccrDnsTtl != dsOriginal.ccrDnsTtl">Current Value: [ {{dsOriginal.ccrDnsTtl}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.ccrDnsTtl != dsCurrent.ccrDnsTtl">Current Value: [ {{dsCurrent.ccrDnsTtl}} ]</small>
<span ng-show="hasError(deliveryServiceForm.ccrDnsTtl)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
</div>
@@ -255,7 +255,7 @@ under the License.
<div class="col-md-10 col-sm-10 col-xs-12">
<input name="remapText" type="text" class="form-control" ng-model="deliveryService.remapText" ng-maxlength="2048" autofocus>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.remapText, 'maxlength')">Too Long</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.remapText != dsOriginal.remapText">Current Value: [ {{dsOriginal.remapText}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.remapText != dsCurrent.remapText">Current Value: [ {{dsCurrent.remapText}} ]</small>
<span ng-show="hasError(deliveryServiceForm.remapText)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
</div>
@@ -265,7 +265,7 @@ under the License.
<div class="col-md-10 col-sm-10 col-xs-12">
<input name="longDesc1" type="text" class="form-control" ng-model="deliveryService.longDesc1" ng-maxlength="1024" autofocus>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.longDesc1, 'maxlength')">Too Long</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.longDesc1 != dsOriginal.longDesc1">Current Value: [ {{dsOriginal.longDesc1}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.longDesc1 != dsCurrent.longDesc1">Current Value: [ {{dsCurrent.longDesc1}} ]</small>
<span ng-show="hasError(deliveryServiceForm.longDesc1)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
</div>
@@ -275,7 +275,7 @@ under the License.
<div class="col-md-10 col-sm-10 col-xs-12">
<input name="longDesc2" type="text" class="form-control" ng-model="deliveryService.longDesc2" ng-maxlength="1024" autofocus>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.longDesc2, 'maxlength')">Too Long</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.longDesc2 != dsOriginal.longDesc2">Current Value: [ {{dsOriginal.longDesc2}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.longDesc2 != dsCurrent.longDesc2">Current Value: [ {{dsCurrent.longDesc2}} ]</small>
<span ng-show="hasError(deliveryServiceForm.longDesc2)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
</div>
@@ -285,7 +285,7 @@ under the License.
<div class="col-md-10 col-sm-10 col-xs-12">
<input name="infoUrl" type="text" class="form-control" ng-model="deliveryService.infoUrl" ng-maxlength="255" autofocus>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.infoUrl, 'maxlength')">Too Long</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.infoUrl != dsOriginal.infoUrl">Current Value: [ {{dsOriginal.infoUrl}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.infoUrl != dsCurrent.infoUrl">Current Value: [ {{dsCurrent.infoUrl}} ]</small>
<span ng-show="hasError(deliveryServiceForm.infoUrl)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
</div>
@@ -295,7 +295,7 @@ under the License.
<div class="col-md-10 col-sm-10 col-xs-12">
<input name="checkPath" type="text" class="form-control" ng-model="deliveryService.checkPath" ng-maxlength="255" autofocus>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.checkPath, 'maxlength')">Too Long</small>
- <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.checkPath != dsOriginal.checkPath">Current Value: [ {{dsOriginal.checkPath}} ]</small>
+ <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.checkPath != dsCurrent.checkPath">Current Value: [ {{dsCurrent.checkPath}} ]</small>
<span ng-show="hasError(deliveryServiceForm.checkPath)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
</div>
@@ -304,9 +304,9 @@ under the License.
<div class="modal-footer">
<button class="btn btn-link" ng-click="advancedShowing = !advancedShowing"><span ng-show="!advancedShowing">Show</span><span ng-show="advancedShowing">Hide</span> Advanced</button>
- <button type="button" class="btn btn-danger" ng-if="!settings.isNew && !fulfill" ng-disabled="!deletable()" ng-click="confirmDelete(deliveryService)">{{settings.deleteLabel}}</button>
- <button type="button" class="btn btn-success" ng-if="!fulfill" ng-disabled="deliveryServiceForm.$pristine || deliveryServiceForm.$invalid || !saveable()" ng-click="save(deliveryService)">{{settings.saveLabel}}</button>
- <button type="button" class="btn btn-success" ng-if="settings.isRequest && fulfill" ng-disabled="deliveryServiceForm.$invalid" ng-click="fulfillRequest(deliveryService)">Fulfill Request</button>
+ <button type="button" class="btn btn-danger" ng-if="!settings.isNew" ng-disabled="!deletable()" ng-click="confirmDelete(deliveryService)">{{settings.deleteLabel}}</button>
+ <button type="button" class="btn btn-success" ng-disabled="deliveryServiceForm.$pristine || deliveryServiceForm.$invalid || !saveable()" ng-click="save(deliveryService)">{{settings.saveLabel}}</button>
+ <button type="button" class="btn btn-primary" ng-if="settings.isRequest" ng-disabled="deliveryServiceForm.$invalid || !fulfillable()" ng-click="fulfillRequest(deliveryService)">Fulfill Request</button>
</div>
</form>
</div>
diff --git a/traffic_portal/app/src/common/modules/form/deliveryService/new/FormNewDeliveryServiceController.js b/traffic_portal/app/src/common/modules/form/deliveryService/new/FormNewDeliveryServiceController.js
index 01d8ebb..9f22ed3 100644
--- a/traffic_portal/app/src/common/modules/form/deliveryService/new/FormNewDeliveryServiceController.js
+++ b/traffic_portal/app/src/common/modules/form/deliveryService/new/FormNewDeliveryServiceController.js
@@ -20,7 +20,7 @@
var FormNewDeliveryServiceController = function(deliveryService, type, types, $scope, $controller, $uibModal, deliveryServiceService, deliveryServiceRequestService) {
// extends the FormDeliveryServiceController to inherit common methods
- angular.extend(this, $controller('FormDeliveryServiceController', { deliveryService: deliveryService, dsOriginal: deliveryService, type: type, types: types, $scope: $scope }));
+ angular.extend(this, $controller('FormDeliveryServiceController', { deliveryService: deliveryService, dsCurrent: deliveryService, type: type, types: types, $scope: $scope }));
$scope.deliveryServiceName = 'New';
diff --git a/traffic_portal/app/src/common/modules/table/deliveryServiceRequests/TableDeliveryServiceRequestsController.js b/traffic_portal/app/src/common/modules/table/deliveryServiceRequests/TableDeliveryServiceRequestsController.js
index 54cc2c5..8655760 100644
--- a/traffic_portal/app/src/common/modules/table/deliveryServiceRequests/TableDeliveryServiceRequestsController.js
+++ b/traffic_portal/app/src/common/modules/table/deliveryServiceRequests/TableDeliveryServiceRequestsController.js
@@ -22,7 +22,7 @@ var TableDeliveryServicesRequestsController = function(dsRequests, $scope, $stat
var createDeliveryServiceDeleteRequest = function(deliveryService) {
var params = {
title: "Delivery Service Delete Request",
- message: 'All delivery service changes must be reviewed before completion.<br><br>Are you sure you want to submit a request to delete the ' + deliveryService.xmlId + ' delivery service?'
+ message: 'All delivery service deletions must be reviewed.<br><br>Are you sure you want to submit a request to delete the ' + deliveryService.xmlId + ' delivery service?'
};
var modalInstance = $uibModal.open({
templateUrl: 'common/modules/dialog/confirm/dialog.confirm.tpl.html',
@@ -144,6 +144,7 @@ var TableDeliveryServicesRequestsController = function(dsRequests, $scope, $stat
case $scope.SUBMITTED:
request.status = 'submitted';
}
+ // todo jeremy: this needs to call the api to update ds request status
deliveryServiceRequestService.updateDeliveryServiceRequest(request.id, request).
then(function() {
$scope.refresh();
@@ -375,7 +376,7 @@ var TableDeliveryServicesRequestsController = function(dsRequests, $scope, $stat
var path = '/delivery-service-requests/' + request.id + '?type=';
typeService.getType(request.request.typeId)
.then(function(result) {
- path += result.name + '&fulfill=true';
+ path += result.name;
locationUtils.navigateToPath(path);
});
};
diff --git a/traffic_portal/app/src/modules/private/deliveryServiceRequests/edit/FormEditDeliveryServiceRequestController.js b/traffic_portal/app/src/modules/private/deliveryServiceRequests/edit/FormEditDeliveryServiceRequestController.js
index 466ddd1..f1e3792 100644
--- a/traffic_portal/app/src/modules/private/deliveryServiceRequests/edit/FormEditDeliveryServiceRequestController.js
+++ b/traffic_portal/app/src/modules/private/deliveryServiceRequests/edit/FormEditDeliveryServiceRequestController.js
@@ -22,7 +22,7 @@ var FormEditDeliveryServiceRequestController = function(deliveryServiceRequest,
var dsRequest = deliveryServiceRequest[0];
// extends the FormDeliveryServiceController to inherit common methods
- angular.extend(this, $controller('FormDeliveryServiceController', { deliveryService: dsRequest.request, dsOriginal: deliveryService, type: type, types: types, $scope: $scope }));
+ angular.extend(this, $controller('FormDeliveryServiceController', { deliveryService: dsRequest.request, dsCurrent: deliveryService, type: type, types: types, $scope: $scope }));
$scope.changeType = dsRequest.changeType;
@@ -30,8 +30,6 @@ var FormEditDeliveryServiceRequestController = function(deliveryServiceRequest,
$scope.deliveryServiceName = angular.copy(dsRequest.request.xmlId);
- $scope.fulfill = $stateParams.fulfill;
-
$scope.advancedShowing = true;
$scope.settings = {
@@ -49,6 +47,10 @@ var FormEditDeliveryServiceRequestController = function(deliveryServiceRequest,
return (dsRequest.status == 'draft' || dsRequest.status == 'submitted');
};
+ $scope.fulfillable = function() {
+ return dsRequest.status == 'submitted';
+ };
+
$scope.open = function() {
return (dsRequest.status == 'draft' || dsRequest.status == 'submitted' || dsRequest.status == 'pending');
};
@@ -99,6 +101,7 @@ var FormEditDeliveryServiceRequestController = function(deliveryServiceRequest,
}
dsRequest.status = 'complete';
}
+ // todo jeremy: this needs to call the api to update ds request status
deliveryServiceRequestService.updateDeliveryServiceRequest(dsRequest.id, dsRequest).
then(function() {
$state.reload();
@@ -109,12 +112,6 @@ var FormEditDeliveryServiceRequestController = function(deliveryServiceRequest,
};
$scope.fulfillRequest = function(ds) {
- if (dsRequest.status != 'submitted') {
- var msg = "Only 'submitted' delivery service requests can be fulfilled. This request is in '" + dsRequest.status + "' status.";
- messageModel.setMessages([ { level: 'error', text: msg } ], false);
- $anchorScroll(); // scrolls window to top
- return;
- }
var promises = [];
var params = {
title: 'Delivery Service ' + $scope.changeType + ': ' + ds.xmlId,
@@ -135,6 +132,7 @@ var FormEditDeliveryServiceRequestController = function(deliveryServiceRequest,
// make sure the ds request is assigned to the user that is fulfilling the request
dsRequest.assigneeId = userModel.user.id;
// set the status to 'pending'
+ // todo jeremy: this needs to call the api to update ds request status
dsRequest.status = 'pending';
// update the ds request
promises.push(deliveryServiceRequestService.updateDeliveryServiceRequest(dsRequest.id, dsRequest));
--
To stop receiving notification emails like this one, please contact
dewrich@apache.org.