[open-ils-commits] [GIT] Evergreen ILS branch master updated. 420cea901181bd84413826774fa81c180852340a
Evergreen Git
git at git.evergreen-ils.org
Sun Sep 17 10:14:08 EDT 2017
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".
The branch, master has been updated
via 420cea901181bd84413826774fa81c180852340a (commit)
from d02163c4f7a4c1b8223943c86da37bd2ca3f3a44 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 420cea901181bd84413826774fa81c180852340a
Author: Cesar Velez <cesar.velez at equinoxinitiative.org>
Date: Fri Sep 8 16:23:33 2017 -0400
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 <cesar.velez at equinoxinitiative.org>
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
Signed-off-by: Ben Shum <ben at evergreener.net>
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 2cc0256..d3468af 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;
});
}
}])
-----------------------------------------------------------------------
Summary of changes:
.../js/ui/default/staff/admin/workstation/app.js | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list