You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by mi...@apache.org on 2018/06/19 22:06:24 UTC
[trafficcontrol] branch master updated: Fix DSR Origin resolution
This is an automated email from the ASF dual-hosted git repository.
mitchell852 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
The following commit(s) were added to refs/heads/master by this push:
new 75d6735 Fix DSR Origin resolution
75d6735 is described below
commit 75d6735362fa79c8fe4e0e4cd17849c2683680b9
Author: Rawlin Peters <ra...@comcast.com>
AuthorDate: Tue Jun 19 15:48:18 2018 -0600
Fix DSR Origin resolution
---
.../modules/form/deliveryService/form.deliveryService.DNS.tpl.html | 2 +-
.../modules/form/deliveryService/form.deliveryService.HTTP.tpl.html | 2 +-
.../edit/FormEditDeliveryServiceRequestController.js | 6 +++---
.../app/src/modules/private/deliveryServiceRequests/edit/index.js | 3 +++
4 files changed, 8 insertions(+), 5 deletions(-)
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 3c5352e..a42ded8 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
@@ -156,7 +156,7 @@ under the License.
<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:// and be followed by a valid hostname with an optional port (no trailing slash)</small>
<small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.orgServerFqdn != dsCurrent.orgServerFqdn">Current Value: [ {{dsCurrent.orgServerFqdn}} ]</small>
- <small ng-show="!settings.isNew && deliveryService.orgServerFqdn"><a href="/#!/origins/{{origin.id}}" target="_blank">View Details <i class="fa fs-xs fa-external-link"></i></a></small>
+ <small ng-show="!settings.isNew && !settings.isRequest && deliveryService.orgServerFqdn"><a href="/#!/origins/{{origin.id}}" target="_blank">View Details <i class="fa fs-xs fa-external-link"></i></a></small>
<span ng-show="hasError(deliveryServiceForm.orgServerFqdn)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
</div>
diff --git a/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.HTTP.tpl.html b/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.HTTP.tpl.html
index 0908295..c0fb63d 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
@@ -156,7 +156,7 @@ under the License.
<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:// and be followed by a valid hostname with an optional port (no trailing slash)</small>
<small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.orgServerFqdn != dsCurrent.orgServerFqdn">Current Value: [ {{dsCurrent.orgServerFqdn}} ]</small>
- <small ng-show="!settings.isNew && deliveryService.orgServerFqdn"><a href="/#!/origins/{{origin.id}}" target="_blank">View Details <i class="fa fs-xs fa-external-link"></i></a></small>
+ <small ng-show="!settings.isNew && !settings.isRequest && deliveryService.orgServerFqdn"><a href="/#!/origins/{{origin.id}}" target="_blank">View Details <i class="fa fs-xs fa-external-link"></i></a></small>
<span ng-show="hasError(deliveryServiceForm.orgServerFqdn)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
</div>
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 79ed64d..31ce61d 100644
--- a/traffic_portal/app/src/modules/private/deliveryServiceRequests/edit/FormEditDeliveryServiceRequestController.js
+++ b/traffic_portal/app/src/modules/private/deliveryServiceRequests/edit/FormEditDeliveryServiceRequestController.js
@@ -17,12 +17,12 @@
* under the License.
*/
-var FormEditDeliveryServiceRequestController = function(deliveryServiceRequest, deliveryService, type, types, $scope, $state, $stateParams, $controller, $uibModal, $anchorScroll, $q, $location, locationUtils, deliveryServiceService, deliveryServiceRequestService, messageModel, userModel) {
+var FormEditDeliveryServiceRequestController = function(deliveryServiceRequest, deliveryService, origin, type, types, $scope, $state, $stateParams, $controller, $uibModal, $anchorScroll, $q, $location, locationUtils, deliveryServiceService, deliveryServiceRequestService, messageModel, userModel) {
$scope.dsRequest = deliveryServiceRequest[0];
// extends the FormDeliveryServiceController to inherit common methods
- angular.extend(this, $controller('FormDeliveryServiceController', { deliveryService: $scope.dsRequest.deliveryService, dsCurrent: deliveryService, type: type, types: types, $scope: $scope }));
+ angular.extend(this, $controller('FormDeliveryServiceController', { deliveryService: $scope.dsRequest.deliveryService, dsCurrent: deliveryService, origin: origin, type: type, types: types, $scope: $scope }));
$scope.changeType = $scope.dsRequest.changeType;
@@ -259,5 +259,5 @@ var FormEditDeliveryServiceRequestController = function(deliveryServiceRequest,
};
-FormEditDeliveryServiceRequestController.$inject = ['deliveryServiceRequest', 'deliveryService', 'type', 'types', '$scope', '$state', '$stateParams', '$controller', '$uibModal', '$anchorScroll', '$q', '$location', 'locationUtils', 'deliveryServiceService', 'deliveryServiceRequestService', 'messageModel', 'userModel'];
+FormEditDeliveryServiceRequestController.$inject = ['deliveryServiceRequest', 'deliveryService', 'origin', 'type', 'types', '$scope', '$state', '$stateParams', '$controller', '$uibModal', '$anchorScroll', '$q', '$location', 'locationUtils', 'deliveryServiceService', 'deliveryServiceRequestService', 'messageModel', 'userModel'];
module.exports = FormEditDeliveryServiceRequestController;
diff --git a/traffic_portal/app/src/modules/private/deliveryServiceRequests/edit/index.js b/traffic_portal/app/src/modules/private/deliveryServiceRequests/edit/index.js
index 9702bad..a81aa19 100644
--- a/traffic_portal/app/src/modules/private/deliveryServiceRequests/edit/index.js
+++ b/traffic_portal/app/src/modules/private/deliveryServiceRequests/edit/index.js
@@ -59,6 +59,9 @@ module.exports = angular.module('trafficPortal.private.deliveryServiceRequests.e
return dsRequest.deliveryService;
}
},
+ origin: function() {
+ return [{}];
+ },
type: function($stateParams) {
return $stateParams.type;
},