LP#1705068 - fix workstation already exists cancel btn freezes UI
authorCesar Velez <cesar.velez@equinoxinitiative.org>
Fri, 8 Sep 2017 20:23:33 +0000 (16:23 -0400)
committerBen Shum <ben@evergreener.net>
Sun, 17 Sep 2017 14:13:45 +0000 (10:13 -0400)
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 <cesar.velez@equinoxinitiative.org>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Signed-off-by: Ben Shum <ben@evergreener.net>
Open-ILS/web/js/ui/default/staff/admin/workstation/app.js

index 2cc0256..d3468af 100644 (file)
@@ -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;
         });
     }
 }])