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

[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  4489629dec1380314aa646ceaf15208bad35ec79 (commit)
      from  fba0719e6fa2685be3b0993f53be636c52024a58 (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 4489629dec1380314aa646ceaf15208bad35ec79
Author: Mike Risher <mrisher at catalyte.io>
Date:   Tue Feb 4 22:42:08 2020 +0000

    lp1792995 wrong row details shown on billing grid
    
    When using the bill grid, if one right clicks on a row and views full
    details one is taken to the first selected row.  Make the UI show
    full details for the row being right clicked on.  If no row is
    clicked on show first selected item's details.
    
    Signed-off-by: Mike Risher <mrisher at catalyte.io>
    
     Changes to be committed:
            modified:   Open-ILS/web/js/ui/default/staff/circ/patron/bills.js
            modified:   Open-ILS/web/js/ui/default/staff/services/grid.js
    
    Signed-off-by: Terran McCanna <tmccanna at georgialibraries.org>
    Signed-off-by: Chris Sharp <csharp at georgialibraries.org>

diff --git a/Open-ILS/web/js/ui/default/staff/circ/patron/bills.js b/Open-ILS/web/js/ui/default/staff/circ/patron/bills.js
index 25a01d892d..cb10593068 100644
--- a/Open-ILS/web/js/ui/default/staff/circ/patron/bills.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/patron/bills.js
@@ -812,9 +812,15 @@ function($scope , $q , $routeParams , egCore , egConfirmDialog , $location,
 
     // direct the user to the transaction details page
     $scope.showFullDetails = function(all) {
-        if (all[0]) 
+        var lastClicked = $scope.gridControls.contextMenuItem();
+        if (lastClicked) {
+            $location.path('/circ/patron/' + 
+                patronSvc.current.id() + '/bill/' + lastClicked + '/statement');
+        } else if (all[0]) {
             $location.path('/circ/patron/' + 
                 patronSvc.current.id() + '/bill/' + all[0].id + '/statement');
+        }
+            
     }
 
     $scope.activateBill = function(xact) {
diff --git a/Open-ILS/web/js/ui/default/staff/services/grid.js b/Open-ILS/web/js/ui/default/staff/services/grid.js
index 6224cb97c8..83a1ebb727 100644
--- a/Open-ILS/web/js/ui/default/staff/services/grid.js
+++ b/Open-ILS/web/js/ui/default/staff/services/grid.js
@@ -281,6 +281,10 @@ angular.module('egGridMod',
                     return grid.columnsProvider;
                 }
 
+                controls.contextMenuItem = function() {
+                    return $scope.contextMenuItem;
+                }
+
                 // link in the control functions
                 controls.selectedItems = function() {
                     return grid.getSelectedItems()
@@ -711,6 +715,9 @@ angular.module('egGridMod',
                     if(s.hasOwnProperty('item')){ break; }
                     e = e.parentElement;
                 }
+                
+                $scope.contextMenuItem = grid.indexValue(s.item);
+                
                 // select the right-clicked row if it is not already selected (lp1776557):
                 if(!$scope.selected[grid.indexValue(s.item)]){ $event.target.click(); }
 

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

Summary of changes:
 Open-ILS/web/js/ui/default/staff/circ/patron/bills.js | 8 +++++++-
 Open-ILS/web/js/ui/default/staff/services/grid.js     | 7 +++++++
 2 files changed, 14 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
Evergreen ILS