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:21 UTC
[incubator-trafficcontrol] 05/33: hooks in pending status
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 6208c136c87780ea4ffdca3ce26a04a85a24e144
Author: Jeremy Mitchell <mi...@gmail.com>
AuthorDate: Fri Dec 29 14:59:31 2017 -0700
hooks in pending status
---
.../form/deliveryService/FormDeliveryServiceController.js | 3 ++-
.../form/deliveryService/form.deliveryService.HTTP.tpl.html | 4 ++--
.../deliveryService/form.deliveryService.Steering.tpl.html | 4 ++--
.../form/deliveryService/form.deliveryService.anyMap.tpl.html | 4 ++--
.../TableDeliveryServiceRequestsController.js | 3 ++-
.../edit/FormEditDeliveryServiceRequestController.js | 11 +++++++++--
6 files changed, 19 insertions(+), 10 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 1ea226c..241d079 100644
--- a/traffic_portal/app/src/common/modules/form/deliveryService/FormDeliveryServiceController.js
+++ b/traffic_portal/app/src/common/modules/form/deliveryService/FormDeliveryServiceController.js
@@ -66,7 +66,8 @@ var FormDeliveryServiceController = function(deliveryService, type, types, $scop
$scope.DRAFT = 0;
$scope.SUBMITTED = 1;
$scope.REJECTED = 2;
- $scope.COMPLETE = 3;
+ $scope.PENDING = 3;
+ $scope.COMPLETE = 4;
$scope.types = _.filter(types, function(currentType) {
var category;
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 2a65b39..b4ea4fb 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
@@ -26,7 +26,7 @@ under the License.
<li class="active">{{deliveryServiceName}}</li>
</ol>
<div class="pull-right" role="group" ng-if="settings.isRequest">
- <button class="btn btn-primary" title="Fulfill Request" ng-click="selectDSType()">Fulfill Request</button>
+ <button class="btn btn-primary" title="Fulfill Request" ng-click="fulfill(deliveryService)">Fulfill Request</button>
<div ng-if="changeType == 'update'" class="btn-group" role="group" uib-dropdown is-open="more.isopen">
<button type="button" class="btn btn-default dropdown-toggle" uib-dropdown-toggle aria-haspopup="true" aria-expanded="false">
More
@@ -504,7 +504,7 @@ 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-show="!settings.isNew" ng-click="confirmDelete(deliveryService)">{{settings.deleteLabel}}</button>
- <button type="button" class="btn btn-success" ng-disabled="deliveryServiceForm.$invalid" ng-click="save(deliveryService)">{{settings.saveLabel}}</button>
+ <button type="button" class="btn btn-success" ng-disabled="deliveryServiceForm.$pristine || deliveryServiceForm.$invalid" ng-click="save(deliveryService)">{{settings.saveLabel}}</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 94a232a..7b26465 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
@@ -26,7 +26,7 @@ under the License.
<li class="active">{{deliveryServiceName}}</li>
</ol>
<div class="pull-right" role="group" ng-if="settings.isRequest">
- <button class="btn btn-primary" title="Fulfill Request" ng-click="selectDSType()">Fulfill Request</button>
+ <button class="btn btn-primary" title="Fulfill Request" ng-click="fulfill(deliveryService)">Fulfill Request</button>
<div ng-if="changeType == 'update'" class="btn-group" role="group" uib-dropdown is-open="more.isopen">
<button type="button" class="btn btn-default dropdown-toggle" uib-dropdown-toggle aria-haspopup="true" aria-expanded="false">
More
@@ -290,7 +290,7 @@ 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-show="!settings.isNew" ng-click="confirmDelete(deliveryService)">{{settings.deleteLabel}}</button>
- <button type="button" class="btn btn-success" ng-disabled="deliveryServiceForm.$invalid" ng-click="save(deliveryService)">{{settings.saveLabel}}</button>
+ <button type="button" class="btn btn-success" ng-disabled="deliveryServiceForm.$pristine || deliveryServiceForm.$invalid" ng-click="save(deliveryService)">{{settings.saveLabel}}</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 d584ba6..67b4dd5 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
@@ -26,7 +26,7 @@ under the License.
<li class="active">{{deliveryServiceName}}</li>
</ol>
<div class="pull-right" role="group" ng-if="settings.isRequest">
- <button class="btn btn-primary" title="Fulfill Request" ng-click="selectDSType()">Fulfill Request</button>
+ <button class="btn btn-primary" title="Fulfill Request" ng-click="fulfill(deliveryService)">Fulfill Request</button>
<div ng-if="changeType == 'update'" class="btn-group" role="group" uib-dropdown is-open="more.isopen">
<button type="button" class="btn btn-default dropdown-toggle" uib-dropdown-toggle aria-haspopup="true" aria-expanded="false">
More
@@ -292,7 +292,7 @@ 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-show="!settings.isNew" ng-click="confirmDelete(deliveryService)">{{settings.deleteLabel}}</button>
- <button type="button" class="btn btn-success" ng-disabled="deliveryServiceForm.$invalid" ng-click="save(deliveryService)">{{settings.saveLabel}}</button>
+ <button type="button" class="btn btn-success" ng-disabled="deliveryServiceForm.$pristine || deliveryServiceForm.$invalid" ng-click="save(deliveryService)">{{settings.saveLabel}}</button>
</div>
</form>
</div>
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 ec6749d..cfa2e77 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,8 @@ var TableDeliveryServicesRequestsController = function(dsRequests, $scope, $stat
$scope.DRAFT = 0;
$scope.SUBMITTED = 1;
$scope.REJECTED = 2;
- $scope.COMPLETE = 3;
+ $scope.PENDING = 3;
+ $scope.COMPLETE = 4;
$scope.dsRequests = dsRequests;
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 395c2ab..ddf8a88 100644
--- a/traffic_portal/app/src/modules/private/deliveryServiceRequests/edit/FormEditDeliveryServiceRequestController.js
+++ b/traffic_portal/app/src/modules/private/deliveryServiceRequests/edit/FormEditDeliveryServiceRequestController.js
@@ -17,7 +17,7 @@
* under the License.
*/
-var FormEditDeliveryServiceRequestController = function(deliveryServiceRequest, type, types, $scope, $state, $stateParams, $controller, $uibModal, $anchorScroll, locationUtils, deliveryServiceService, deliveryServiceRequestService, userModel) {
+var FormEditDeliveryServiceRequestController = function(deliveryServiceRequest, type, types, $scope, $state, $stateParams, $controller, $uibModal, $anchorScroll, locationUtils, deliveryServiceService, deliveryServiceRequestService, messageModel, userModel) {
var dsRequest = deliveryServiceRequest[0];
@@ -38,6 +38,11 @@ var FormEditDeliveryServiceRequestController = function(deliveryServiceRequest,
};
$scope.fulfill = function(deliveryService) {
+ if (dsRequest.status != 'submitted') {
+ var msg = "Only 'submitted' delivery service requests can be fulfilled. This request is in '" + dsRequest.status + "' status.";
+ messageModel.setMessages([ { level: 'warning', text: msg } ], false);
+ return;
+ }
var params = {
title: 'Delivery Service ' + $scope.changeType + ': ' + deliveryService.xmlId,
message: 'Are you sure you want to fulfill this delivery service request and ' + $scope.changeType + ' the ' + deliveryService.xmlId + ' delivery service?'
@@ -55,6 +60,8 @@ var FormEditDeliveryServiceRequestController = function(deliveryServiceRequest,
modalInstance.result.then(function() {
// 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'
+ dsRequest.status = 'pending';
deliveryServiceRequestService.updateDeliveryServiceRequest(dsRequest.id, dsRequest);
// now update or create the ds per the ds request
if ($scope.changeType == 'update') {
@@ -126,5 +133,5 @@ var FormEditDeliveryServiceRequestController = function(deliveryServiceRequest,
};
-FormEditDeliveryServiceRequestController.$inject = ['deliveryServiceRequest', 'type', 'types', '$scope', '$state', '$stateParams', '$controller', '$uibModal', '$anchorScroll', 'locationUtils', 'deliveryServiceService', 'deliveryServiceRequestService', 'userModel'];
+FormEditDeliveryServiceRequestController.$inject = ['deliveryServiceRequest', 'type', 'types', '$scope', '$state', '$stateParams', '$controller', '$uibModal', '$anchorScroll', 'locationUtils', 'deliveryServiceService', 'deliveryServiceRequestService', 'messageModel', 'userModel'];
module.exports = FormEditDeliveryServiceRequestController;
--
To stop receiving notification emails like this one, please contact
dewrich@apache.org.