This is an automated email from the ASF dual-hosted git repository.
dangogh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-trafficcontrol.git
The following commit(s) were added to refs/heads/master by this push:
new e3e9200 adds stronger confirm when creating a request to delete a ds
e3e9200 is described below
commit e3e9200a7eef91bfa765c474f3f2925d1dc1198d
Author: Jeremy Mitchell <mitchell...@gmail.com>
AuthorDate: Thu Feb 22 20:19:15 2018 -0700
adds stronger confirm when creating a request to delete a ds
---
.../edit/FormEditDeliveryServiceController.js | 2 +-
.../TableDeliveryServiceRequestsController.js | 34 +++++++++++++++++-----
.../FormEditDeliveryServiceRequestController.js | 4 +--
3 files changed, 29 insertions(+), 11 deletions(-)
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 1c728d0..3fd448d 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
@@ -103,7 +103,7 @@ var FormEditDeliveryServiceController =
function(deliveryService, type, types, $
createDeliveryServiceDeleteRequest(deliveryService);
} else {
var params = {
- title: 'Delete Delivery Service: ' +
deliveryService.displayName,
+ title: 'Delete Delivery Service: ' +
deliveryService.xmlId,
key: deliveryService.xmlId
};
var modalInstance = $uibModal.open({
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 c99782f..b0083fa 100644
---
a/traffic_portal/app/src/common/modules/table/deliveryServiceRequests/TableDeliveryServiceRequestsController.js
+++
b/traffic_portal/app/src/common/modules/table/deliveryServiceRequests/TableDeliveryServiceRequestsController.js
@@ -35,15 +35,33 @@ var TableDeliveryServicesRequestsController =
function(dsRequests, $scope, $stat
}
});
modalInstance.result.then(function() {
- var dsRequest = {
- changeType: 'delete',
- status: 'submitted',
- deliveryService: deliveryService
+ params = {
+ title: 'Delete Delivery Service: ' +
deliveryService.xmlId,
+ key: deliveryService.xmlId
};
-
deliveryServiceRequestService.createDeliveryServiceRequest(dsRequest, false).
- then(function() {
- $scope.refresh();
- });
+ modalInstance = $uibModal.open({
+ templateUrl:
'common/modules/dialog/delete/dialog.delete.tpl.html',
+ controller: 'DialogDeleteController',
+ size: 'md',
+ resolve: {
+ params: function () {
+ return params;
+ }
+ }
+ });
+ modalInstance.result.then(function() {
+ var dsRequest = {
+ changeType: 'delete',
+ status: 'submitted',
+ deliveryService: deliveryService
+ };
+
deliveryServiceRequestService.createDeliveryServiceRequest(dsRequest, false).
+ then(function() {
+ $scope.refresh();
+ });
+ }, function () {
+ // do nothing
+ });
}, function () {
// do nothing
});
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 e4d1619..a978d06 100644
---
a/traffic_portal/app/src/modules/private/deliveryServiceRequests/edit/FormEditDeliveryServiceRequestController.js
+++
b/traffic_portal/app/src/modules/private/deliveryServiceRequests/edit/FormEditDeliveryServiceRequestController.js
@@ -89,14 +89,14 @@ var FormEditDeliveryServiceRequestController =
function(deliveryServiceRequest,
switch (action.id) {
case $scope.DRAFT:
dsRequest.status = 'draft';
-
deliveryServiceRequestService.updateDeliveryServiceRequest(dsRequest.id,
dsRequest).
+
deliveryServiceRequestService.updateDeliveryServiceRequestStatus(dsRequest.id,
'draft').
then(function() {
$state.reload();
});
break;
case $scope.SUBMITTED:
dsRequest.status = 'submitted';
-
deliveryServiceRequestService.updateDeliveryServiceRequest(dsRequest.id,
dsRequest).
+
deliveryServiceRequestService.updateDeliveryServiceRequestStatus(dsRequest.id,
'submitted').
then(function() {
$state.reload();
});
--
To stop receiving notification emails like this one, please contact
dang...@apache.org.
