From 420cea901181bd84413826774fa81c180852340a Mon Sep 17 00:00:00 2001 From: Cesar Velez Date: Fri, 8 Sep 2017 16:23:33 -0400 Subject: [PATCH] LP#1705068 - fix workstation already exists cancel btn freezes UI The $scope.is_registering is used to enable/disable the Register btn and was not being set back to false, when the user chose to cancel using an existing WS name, and exiting the modal. To test ------- 1. Register a workstation. 2. Switch to a different computer or Chrome profile. 3. Try to register the same workstation name. Warning dialog will pop up. 4. Click cancel. 5. See that the register button is now disabled and no actions on the form seem to reactivate it. 6. Apply the patch and repeat steps 2-4. This time, the register button should be active. Signed-off by: Cesar Velez Signed-off-by: Galen Charlton Signed-off-by: Ben Shum --- Open-ILS/web/js/ui/default/staff/admin/workstation/app.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Open-ILS/web/js/ui/default/staff/admin/workstation/app.js b/Open-ILS/web/js/ui/default/staff/admin/workstation/app.js index 2cc025623f..d3468af3c4 100644 --- a/Open-ILS/web/js/ui/default/staff/admin/workstation/app.js +++ b/Open-ILS/web/js/ui/default/staff/admin/workstation/app.js @@ -108,7 +108,9 @@ function($q , $timeout , $location , egCore , egConfirmDialog) { service.register_ws_api( base_name, name, org_id, true, deferred) }, - cancel : function() {deferred.reject()} + cancel : function() { + deferred.reject(); + } } ); @@ -861,6 +863,8 @@ function($scope , $q , $window , $location , egCore , egAlertDialog , workstatio return $scope.set_default_ws(new_ws.name); } $scope.newWSName = ''; + }, function(err) { + $scope.is_registering = false; }); } }]) -- 2.43.2