From 9600f3016296f080dcbd367ae05efb95128fcefa Mon Sep 17 00:00:00 2001 From: Mike Rylander Date: Tue, 29 Nov 2016 16:29:48 -0500 Subject: [PATCH] webstaff: Allow persistent op change Signed-off-by: Mike Rylander Signed-off-by: Kathy Lussier --- Open-ILS/web/js/ui/default/staff/services/auth.js | 8 +++++--- Open-ILS/web/js/ui/default/staff/services/navbar.js | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) 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 3ab8563a63..4e9895642f 100644 --- a/Open-ILS/web/js/ui/default/staff/services/auth.js +++ b/Open-ILS/web/js/ui/default/staff/services/auth.js @@ -191,9 +191,11 @@ function($q , $timeout , $rootScope , $window , $location , egNet , egHatch) { service.login_api(args).then(function(evt) { if (evt.textcode == 'SUCCESS') { - egHatch.setLoginSessionItem('eg.auth.token.oc', service.token()); - egHatch.setLoginSessionItem('eg.auth.time.oc', service.authtime()); - service.OCuser(service.user()); + if (args.type != 'persist') { + 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); service.testAuthToken().then( deferred.resolve, 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 c9aa522ba5..ccb7d4dd2b 100644 --- a/Open-ILS/web/js/ui/default/staff/services/navbar.js +++ b/Open-ILS/web/js/ui/default/staff/services/navbar.js @@ -96,7 +96,7 @@ angular.module('egCoreMod') egCore.auth.opChange(args).then( function() { console.log('op change success'); - $scope.op_changed = true; + $scope.op_changed = egCore.auth.OCtoken() ? true : false; $scope.username = egCore.auth.user().usrname(); ngToast.create(egCore.strings.OP_CHANGE_SUCCESS); }, // note success with toast? -- 2.43.2