From: blake Date: Mon, 2 Oct 2017 19:42:06 +0000 (-0500) Subject: lp1642036 Web Staff Client - Group Members Don't Display X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=fa4d1d0974fdafe86321f15301479aeebc876136;p=working%2FEvergreen.git lp1642036 Web Staff Client - Group Members Don't Display Altered app.js so that the call to grid.setQuery happens after the initTab execution. Using .then(). Test: 1. Login to webby. Search patrons. Find a patron. 2. Click a search result and click the "Other" Menu. 3. Choose "Group Member Details" 4. Notice that there are no grid items. 5. Apply the patch. Repeat 1-3. 6. Notice that there is at least one grid item. Signed-off-by: blake --- diff --git a/Open-ILS/web/js/ui/default/staff/circ/patron/app.js b/Open-ILS/web/js/ui/default/staff/circ/patron/app.js index e7d6430453..e2c1eb2fab 100644 --- a/Open-ILS/web/js/ui/default/staff/circ/patron/app.js +++ b/Open-ILS/web/js/ui/default/staff/circ/patron/app.js @@ -980,9 +980,12 @@ function($scope, $routeParams , $q , $window , $timeout, $location , egCore , .then(function(redirect) { // if we are redirecting to the alerts page, avoid updating the // grid query. - if (redirect) return; + if (redirect) return redirect; // let initTab() fetch the user first so we can know the usrgroup + }).then(function(redirect){ + + if (redirect) return; grid.setQuery({ usrgroup : patronSvc.current.usrgroup(), deleted : 'f'