[open-ils-commits] [GIT] Evergreen ILS branch rel_2_12 updated. 688c826a5959deeb2fb71421278de4ce930e9823

[Evergreen Git]

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, rel_2_12 has been updated
       via  688c826a5959deeb2fb71421278de4ce930e9823 (commit)
       via  6701e55742a2701c36a6771d9ef2d79c2ac06810 (commit)
      from  d886b1663822f8b636e790db538ffa9618b3b274 (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 688c826a5959deeb2fb71421278de4ce930e9823
Author: Galen Charlton <gmc at equinoxinitiative.org>
Date:   Wed Jul 19 11:57:31 2017 -0400

    LP#1702756: follow-up - tidy some ersatz whitespace
    
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>

diff --git a/Open-ILS/web/js/ui/default/staff/circ/patron/regctl.js b/Open-ILS/web/js/ui/default/staff/circ/patron/regctl.js
index d0dcca8..3cc9348 100644
--- a/Open-ILS/web/js/ui/default/staff/circ/patron/regctl.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/patron/regctl.js
@@ -1208,7 +1208,7 @@ function($scope , $routeParams , $q , $uibModal , $window , egCore ,
         extract_hold_notify();
         if ($scope.patron.isnew)
             set_new_patron_defaults(prs);
-        
+
         $scope.handle_home_org_changed();
 
         if ($scope.org_settings['ui.patron.edit.default_suggested'])

commit 6701e55742a2701c36a6771d9ef2d79c2ac06810
Author: Cesar Velez <cesar.velez at equinoxinitiative.org>
Date:   Mon Jul 10 16:47:26 2017 -0400

    LP#1702756 - WebStaff fix for bug that was introduced by 997e2772
    
    While addressing LP#1696495 fixed the bug of user settings caching
    improperly between patron edits, it caused an issue when the regctl
    was loaded for registering a new patron. This corrects that.
    
    Signed-off by: Cesar Velez <cesar.velez at equinoxinitiative.org>
    Signed-off-by: Josh Stompro <stomproj at larl.org>
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
    
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>

diff --git a/Open-ILS/web/js/ui/default/staff/circ/patron/regctl.js b/Open-ILS/web/js/ui/default/staff/circ/patron/regctl.js
index 4e53fde..d0dcca8 100644
--- a/Open-ILS/web/js/ui/default/staff/circ/patron/regctl.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/patron/regctl.js
@@ -581,7 +581,7 @@ angular.module('egCoreMod')
     service.init_patron = function(current) {
 
         if (!current)
-            return service.init_new_patron();
+            return $q.when(service.init_new_patron());
 
         service.patron = current;
         return $q.when(service.init_existing_patron(current));
@@ -656,6 +656,7 @@ angular.module('egCoreMod')
         });
 
         service.patron = patron;
+        return patron;
     }
 
     service.init_new_patron = function() {
@@ -1180,13 +1181,12 @@ function($scope , $routeParams , $q , $uibModal , $window , egCore ,
 
         patronRegSvc.init(),
 
-    ]).then(function(){ return patronRegSvc.init_patron(patronSvc ? patronSvc.current : null) })
-      .then(patronRegSvc.get_user_settings)
-      .then(function() {
+    ]).then(function(){ return patronRegSvc.init_patron(patronSvc ? patronSvc.current : patronRegSvc.patron ) })
+      .then(function(patron) {
         // called after initTab and patronRegSvc.init have completed
         // in standalone mode, we have no patronSvc
         var prs = patronRegSvc;
-        $scope.patron = prs.patron;
+        $scope.patron = patron;
         $scope.field_doc = prs.field_doc;
         $scope.edit_profiles = prs.edit_profiles;
         $scope.ident_types = prs.ident_types;
@@ -1206,14 +1206,14 @@ function($scope , $routeParams , $q , $uibModal , $window , egCore ,
         prs.user_settings = {};
 
         extract_hold_notify();
+        if ($scope.patron.isnew)
+            set_new_patron_defaults(prs);
+        
         $scope.handle_home_org_changed();
 
         if ($scope.org_settings['ui.patron.edit.default_suggested'])
             $scope.edit_passthru.vis_level = 1;
 
-        if ($scope.patron.isnew) 
-            set_new_patron_defaults(prs);
-
         // Stat cats are fetched from open-ils.storage, where 't'==1
         $scope.hasRequiredStatCat = prs.stat_cats.filter(
                 function(cat) {return cat.required() == 1} ).length > 0;

-----------------------------------------------------------------------

Summary of changes:
 .../web/js/ui/default/staff/circ/patron/regctl.js  |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
Evergreen ILS