webstaff: Allow persistent op change
authorMike Rylander <mrylander@gmail.com>
Tue, 29 Nov 2016 21:29:48 +0000 (16:29 -0500)
committerKathy Lussier <klussier@masslnc.org>
Mon, 9 Jan 2017 15:58:59 +0000 (10:58 -0500)
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Signed-off-by: Kathy Lussier <klussier@masslnc.org>
Open-ILS/web/js/ui/default/staff/services/auth.js
Open-ILS/web/js/ui/default/staff/services/navbar.js

index 3ab8563..4e98956 100644 (file)
@@ -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,
index c9aa522..ccb7d4d 100644 (file)
@@ -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?