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

[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  77daa321e7086b0b37ad9a093869734bda7a6781 (commit)
       via  ffdd4b09c3550d7546c94e3c40ba51e3a718473a (commit)
      from  6856c8466fd1839ed2bf8ed67fdcc07dd8bd579f (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 77daa321e7086b0b37ad9a093869734bda7a6781
Author: Bill Erickson <berickxx at gmail.com>
Date:   Tue Jul 28 10:44:38 2015 -0400

    LP#1478997 Items out display sort overdues to top (webstaff)
    
    Sort overdue items to the top of the patron items out display in the
    webstaff client, consistent with pre-2.5 behavior.
    
    Signed-off-by: Bill Erickson <berickxx at gmail.com>
    Signed-off-by: Ben Shum <bshum at biblio.org>

diff --git a/Open-ILS/web/js/ui/default/staff/circ/patron/items_out.js b/Open-ILS/web/js/ui/default/staff/circ/patron/items_out.js
index f8f4dd8..88a8983 100644
--- a/Open-ILS/web/js/ui/default/staff/circ/patron/items_out.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/patron/items_out.js
@@ -182,7 +182,7 @@ function($scope,  $q,  $routeParams,  egCore , egUser,  patronSvc ,
             'open-ils.actor.user.checked_out.authoritative',
             egCore.auth.token(), $scope.patron_id
         ).then(function(outs) {
-            $scope.main_list = outs.out.concat(outs.overdue);
+            $scope.main_list = outs.overdue.concat(outs.out);
             promote_circs(outs.lost, display_lost, true);                            
             promote_circs(outs.long_overdue, display_lo, true);             
             promote_circs(outs.claims_returned, display_cr, true);

commit ffdd4b09c3550d7546c94e3c40ba51e3a718473a
Author: Bill Erickson <berickxx at gmail.com>
Date:   Tue Jul 28 10:39:57 2015 -0400

    LP#1478997 Items out display sort overdues to top
    
    Sort overdue items to the top of the patron items out display in the XUL
    client, consistent with pre-2.5 behavior.
    
    Signed-off-by: Bill Erickson <berickxx at gmail.com>
    Signed-off-by: Ben Shum <bshum at biblio.org>

diff --git a/Open-ILS/xul/staff_client/server/patron/items.js b/Open-ILS/xul/staff_client/server/patron/items.js
index 463f15e..42b9884 100644
--- a/Open-ILS/xul/staff_client/server/patron/items.js
+++ b/Open-ILS/xul/staff_client/server/patron/items.js
@@ -958,8 +958,8 @@ patron.items.prototype = {
                 return;
             }
 
-            obj.checkouts = obj.checkouts.concat(robj.out);
             obj.checkouts = obj.checkouts.concat(robj.overdue);
+            obj.checkouts = obj.checkouts.concat(robj.out);
 
             // open circs are added to list one or two based on config.
             // closed circs added to list 2 only if configured, otherwise

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

Summary of changes:
 .../js/ui/default/staff/circ/patron/items_out.js   |    2 +-
 Open-ILS/xul/staff_client/server/patron/items.js   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Evergreen ILS