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

[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  dcf52caab8f188d250ac82fd9e6b95fa07a1f320 (commit)
      from  d8eacd2fd21ed5b6670333ad3a2d4c685634680f (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 dcf52caab8f188d250ac82fd9e6b95fa07a1f320
Author: Bill Erickson <berickxx at gmail.com>
Date:   Wed Aug 9 16:41:53 2017 -0400

    LP#1709476 Copy summary aged circ display repair
    
    Always check active and aged circs (via "aacs" class) for circs to
    display for a given copy in the item status Quick Summary and Recent
    Circ History tabs.  When a aged circ is encountered, display the '<Aged
    Circulation>' tag in lieu of the patron's name.
    
    To test:
    [1] Checkout and checkin a copy.
    [2] Checkout and checkin the same copy to a different patron
    [3] Manually delete the 2nd circulation in the database.
    [4] Load the Item Status interface for the copy.
    [5] Confirm chekout time, etc. for the 2nd show in the Quick Summary
        circulation data.
    [6] Confirm the patron displayed under the 'Recent Circ History' tab
        shows '<Aged Circulation>'
    
    Signed-off-by: Bill Erickson <berickxx at gmail.com>
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>

diff --git a/Open-ILS/src/templates/staff/cat/item/t_circs_pane.tt2 b/Open-ILS/src/templates/staff/cat/item/t_circs_pane.tt2
index 8a165b3..be36803 100644
--- a/Open-ILS/src/templates/staff/cat/item/t_circs_pane.tt2
+++ b/Open-ILS/src/templates/staff/cat/item/t_circs_pane.tt2
@@ -23,7 +23,7 @@
       </a>
       <span ng-show="!prev_circ_usr">
         [% l('<Aged Circulation>') | html %]
-    </span>
+      </span>
     </div>
   </div>
 
@@ -109,13 +109,16 @@
     <div class="flex-cell">[% l('Patron') %]</div>
     <div class="flex-cell well">
       <a href="./circ/patron/{{circ.usr().id()}}/checkout" 
-        ng-if="circ" target="_self">
+        ng-if="circ.usr()" target="_self">
         [% l('[_1], [_2] [_3] : [_4]', 
           '{{circ.usr().family_name()}}'
           '{{circ.usr().first_given_name()}}'
           '{{circ.usr().second_given_name()}}'
           '{{circ.usr().card().barcode()}}') %]
       </a>
+      <span ng-show="!circ.usr()">
+        [% l('<Aged Circulation>') | html %]
+      </span>
     </div>
   </div>
 
diff --git a/Open-ILS/web/js/ui/default/staff/cat/item/app.js b/Open-ILS/web/js/ui/default/staff/cat/item/app.js
index 7bd717d..8d73b9d 100644
--- a/Open-ILS/web/js/ui/default/staff/cat/item/app.js
+++ b/Open-ILS/web/js/ui/default/staff/cat/item/app.js
@@ -1449,11 +1449,11 @@ function($scope , $q , $location , $routeParams , $timeout , $window , egCore ,
         delete $scope.prev_circ_usr;
         if (!copyId) return;
         
-        egCore.pcrud.search('circ', 
+        egCore.pcrud.search('aacs', 
             {target_copy : copyId},
             {   flesh : 2,
                 flesh_fields : {
-                    circ : [
+                    aacs : [
                         'usr',
                         'workstation',                                         
                         'checkin_workstation',                                 
@@ -1463,7 +1463,7 @@ function($scope , $q , $location , $routeParams , $timeout , $window , egCore ,
                     ],
                     au : ['card']
                 },
-                order_by : {circ : 'xact_start desc'}, 
+                order_by : {aacs : 'xact_start desc'}, 
                 limit :  1
             }
 

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

Summary of changes:
 .../src/templates/staff/cat/item/t_circs_pane.tt2  |    7 +++++--
 Open-ILS/web/js/ui/default/staff/cat/item/app.js   |    6 +++---
 2 files changed, 8 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
Evergreen ILS