[open-ils-commits] [GIT] Evergreen ILS branch rel_3_0 updated. 9f71b6a134458a8908680322e8b3149f5afd4d9c

[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_3_0 has been updated
       via  9f71b6a134458a8908680322e8b3149f5afd4d9c (commit)
      from  e6635561c4906e9ae7e3ebfd0540f494bbe7044b (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 9f71b6a134458a8908680322e8b3149f5afd4d9c
Author: Mike Rylander <mrylander at gmail.com>
Date:   Mon Dec 11 16:21:39 2017 -0500

    LP#1736763: Wait until the org tree is there before using it
    
    In offline mode, we need to wait for the org tree to be fetched or recreated
    before we set the working location dropdown.  This commit adds a function
    to loop and wait for that to happen.
    
    Signed-off-by: Mike Rylander <mrylander at gmail.com>
    Signed-off-by: Cesar Velez <cesar.velez at equinoxinitiative.org>

diff --git a/Open-ILS/web/js/ui/default/staff/offline.js b/Open-ILS/web/js/ui/default/staff/offline.js
index 8c75f14..25046b8 100644
--- a/Open-ILS/web/js/ui/default/staff/offline.js
+++ b/Open-ILS/web/js/ui/default/staff/offline.js
@@ -359,7 +359,9 @@ function($routeProvider , $locationProvider , $compileProvider) {
 
                     if (match) {
                         // requested WS registered on this client
+                        $scope.workstation_obj = match;
                         $scope.workstation = match.id;
+                        $scope.workstation_owner = match.owning_lib;
                     } else {
                         // the requested WS is not registered on this client
                         $scope.wsNotRegistered = true;
@@ -721,6 +723,17 @@ function($routeProvider , $locationProvider , $compileProvider) {
             return check_digit;
         }
 
+        function fetch_org_after_tree_exists () {
+            $timeout(function(){
+                try {
+                    $scope.org = egCore.org.get($scope.current_workstation_owning_lib());
+                } catch(e) {
+                    fetch_org_after_tree_exists();
+                }
+            },100);
+        }
+
+        fetch_org_after_tree_exists();
     }
 ])
 

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

Summary of changes:
 Open-ILS/web/js/ui/default/staff/offline.js |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
Evergreen ILS