[open-ils-commits] [GIT] Evergreen ILS branch master updated. ef2655fc88d06334d6f73d6fab8a4661d35b97a1

[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, master has been updated
       via  ef2655fc88d06334d6f73d6fab8a4661d35b97a1 (commit)
      from  c1c7daa4c548e487869159eaea94a9fbc79dec0d (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 ef2655fc88d06334d6f73d6fab8a4661d35b97a1
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 c27360b..1441c38 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