webstaff: Display issue with operator change

Signed-off-by: Mike Rylander <mrylander@gmail.com>
Signed-off-by: Kathy Lussier <klussier@masslnc.org>

diff --git a/Open-ILS/web/js/ui/default/staff/services/auth.js b/Open-ILS/web/js/ui/default/staff/services/auth.js
index 638ce7d..3ab8563 100644 (file)
--- a/Open-ILS/web/js/ui/default/staff/services/auth.js
+++ b/Open-ILS/web/js/ui/default/staff/services/auth.js
@@ -191,12 +191,14 @@ function($q , $timeout , $rootScope , $window , $location , egNet , egHatch) {
         service.login_api(args).then(function(evt) {
 
             if (evt.textcode == 'SUCCESS') {
-                service.OCuser(service.user());
                 egHatch.setLoginSessionItem('eg.auth.token.oc', service.token());
                 egHatch.setLoginSessionItem('eg.auth.time.oc', service.authtime());
+                service.OCuser(service.user());
                 service.handle_login_ok(args, evt);
-                deferred.resolve();
-
+                service.testAuthToken().then(
+                    deferred.resolve,
+                    function () { service.opChangeUndo().then(deferred.reject)  }
+                );
             } else {
                 // note: the likely outcome here is a NO_SESION
                 // server event, which results in broadcasting an 

diff --git a/Open-ILS/web/js/ui/default/staff/services/navbar.js b/Open-ILS/web/js/ui/default/staff/services/navbar.js
index 305a62c..c9aa522 100644 (file)
--- a/Open-ILS/web/js/ui/default/staff/services/navbar.js
+++ b/Open-ILS/web/js/ui/default/staff/services/navbar.js
@@ -75,6 +75,7 @@ angular.module('egCoreMod')
                 $scope.changeOperatorUndo = function() {
                         egCore.auth.opChangeUndo();
                         $scope.op_changed = false;
+                        $scope.username = egCore.auth.user().usrname();
                         ngToast.create(egCore.strings.OP_CHANGE_SUCCESS);
                 }
 
@@ -96,6 +97,7 @@ angular.module('egCoreMod')
                             function() {
                                 console.log('op change success');
                                 $scope.op_changed = true;
+                                $scope.username = egCore.auth.user().usrname();
                                 ngToast.create(egCore.strings.OP_CHANGE_SUCCESS);
                             }, // note success with toast?
                             function() {