test
authorMike Risher <mrisher@catalyte.io>
Thu, 6 Aug 2020 21:01:39 +0000 (21:01 +0000)
committerBill Erickson <berickxx@gmail.com>
Thu, 6 Aug 2020 22:03:26 +0000 (18:03 -0400)
Signed-off-by: Mike Risher <mrisher@catalyte.io>
Changes to be committed:
modified:   Open-ILS/web/js/ui/default/staff/services/env.js
modified:   Open-ILS/web/js/ui/default/staff/services/ui.js

Open-ILS/web/js/ui/default/staff/services/env.js
Open-ILS/web/js/ui/default/staff/services/ui.js

index cf768b1..b1fcec9 100644 (file)
@@ -151,6 +151,14 @@ function($q,  $window , $injector , egAuth,  egPCRUD,  egIDL) {
         return blob;
     };
 
+    // sort orgs at each level by shortname
+    service.sort_aou = function(node) {
+        node.children(node.children().sort(function(a, b) {
+            return a.shortname() < b.shortname() ? -1 : 1;
+        }));
+        angular.forEach(node.children(), service.sort_aou);
+    }
+
     /* 
      * list of classes to load on every page, regardless of whether
      * a page-specific list is provided.
@@ -184,19 +192,13 @@ function($q,  $window , $injector , egAuth,  egPCRUD,  egIDL) {
                     return $q.when(tree);
                 }
     
-                // sort orgs at each level by shortname
-                function sort_aou(node) {
-                    node.children(node.children().sort(function(a, b) {
-                        return a.shortname() < b.shortname() ? -1 : 1;
-                    }));
-                    angular.forEach(node.children(), sort_aou);
-                }
+
     
                 return egPCRUD.search('aou', {parent_ou : null}, 
                     {flesh : -1, flesh_fields : {aou : ['children', 'ou_type']}}
                 ).then(
                     function(tree) {
-                        sort_aou(tree);
+                        service.sort_aou(tree);
                         $window.sessionStorage.setItem(
                             'eg.env.aou.tree', js2JSON(tree));
                         service.absorbTree(tree, 'aou');
index f8f7cd1..73e16b5 100644 (file)
@@ -1115,6 +1115,13 @@ function($uibModal , $interpolate , egCore) {
 
                     $scope.selecteName = '';
 
+                    console.log("****** LIST A")
+                    console.log(egCore.org.list())
+                    console.log("****** SORT2")
+                    egCore.env.sort_aou(egCore.org.root());
+                    console.log("****** LIST B")
+                    console.log(egCore.org.list())
+
                     $scope.shortNames = egCore.org.list()
                     .filter(function(org) {
                         return !(