[trafficcontrol] branch 4.1.x updated: handles error scenario when fulfilling a dsr immediately and ds update fails (#5193) (#5194)

[rawlin]

This is an automated email from the ASF dual-hosted git repository.

rawlin pushed a commit to branch 4.1.x
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git


The following commit(s) were added to refs/heads/4.1.x by this push:
     new 1ba5bc6  handles error scenario when fulfilling a dsr immediately and 
ds update fails (#5193) (#5194)
1ba5bc6 is described below

commit 1ba5bc690b830ae43567f50d032b55dd75453044
Author: Rawlin Peters <raw...@apache.org>
AuthorDate: Mon Oct 26 14:14:44 2020 -0600

    handles error scenario when fulfilling a dsr immediately and ds update 
fails (#5193) (#5194)
    
    (cherry picked from commit 59401293ddde8125e0db91acab827a7a76ede8e7)
    
    Co-authored-by: Jeremy Mitchell <mitchell...@users.noreply.github.com>
---
 .../form/deliveryService/edit/FormEditDeliveryServiceController.js   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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 40bf560..ec64d7d 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
@@ -208,7 +208,10 @@ var FormEditDeliveryServiceController = 
function(deliveryService, origin, type,
                                                                                
$state.reload(); // reloads all the resolves for the view
                                                                                
messageModel.setMessages([ { level: 'success', text: 'Delivery Service [ ' + 
deliveryService.xmlId + ' ] updated' } ], false);
                                                                        }
-                                                               );
+                                                               
).catch(function(fault) {
+                                                                       
$anchorScroll(); // scrolls window to top
+                                                                       
messageModel.setMessages(fault.data.alerts, false);
+                                                               });
                                                }).catch(function(fault) {
                                                        $anchorScroll(); // 
scrolls window to top
                                                        
messageModel.setMessages(fault.data.alerts, false);