[open-ils-commits] [GIT] Evergreen ILS branch rel_3_0 updated. e488506029c432d59a7d8a1fe8e426013cff0728

[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, rel_3_0 has been updated
       via  e488506029c432d59a7d8a1fe8e426013cff0728 (commit)
      from  91e1fab8fde212a0d401dc2236b18187207815fa (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 e488506029c432d59a7d8a1fe8e426013cff0728
Author: Cesar Velez <cesar.velez at equinoxinitiative.org>
Date:   Thu Sep 28 10:48:58 2017 -0400

    LP#1715423 - fix issues with the display of IDs in patron summary pane
    
    The Patron summary pane was not properly displaying the values
    for the primary ID and secondary ID. Also added the type name of
    the ID in next to primary ID label.
    
    Signed-off by: Cesar Velez <cesar.velez at equinoxinitiative.org>
    
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>

diff --git a/Open-ILS/src/templates/staff/circ/patron/t_summary.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_summary.tt2
index 632f50b..9d55e17 100644
--- a/Open-ILS/src/templates/staff/circ/patron/t_summary.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_summary.tt2
@@ -143,12 +143,12 @@
       <div class="col-md-7">{{patron().other_phone()}}</div>
     </div>
     <div class="row">
-      <div class="col-md-5">[% l('ID1') %]</div>
-      <div class="col-md-7">{{patron().ident_type().name()}}</div>
+      <div class="col-md-5">[% l('ID1') %] <span ng-if="hasIdentTypeName" class="ident_type">({{patron().ident_type().name()}})</span></div>
+      <div class="col-md-7">{{patron().ident_value()}}</div>
     </div>
     <div class="row">
       <div class="col-md-5">[% l('ID2') %]</div>
-      <div class="col-md-7">{{patron().ident_type2().name()}}</div>
+      <div class="col-md-7">{{patron().ident_value2()}}</div>
     </div>
     <div class="row">
       <div class="col-md-5">[% l('Email') %]</div>
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 e7d6430..5326e9f 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
@@ -292,7 +292,11 @@ function($scope,  $q , $location , $filter , egCore , egNet , egUser , egAlertDi
             $scope.patron_id = patron_id;
             return patronSvc.setPrimary($scope.patron_id)
             .then(function() {return patronSvc.checkAlerts()})
-            .then(redirectToAlertPanel);
+            .then(redirectToAlertPanel)
+            .then(function(){
+                $scope.ident_type_name = $scope.patron().ident_type().name()
+                $scope.hasIdentTypeName = $scope.ident_type_name.length > 0;
+            });
         }
         return $q.when();
     }

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

Summary of changes:
 .../src/templates/staff/circ/patron/t_summary.tt2  |    6 +++---
 .../web/js/ui/default/staff/circ/patron/app.js     |    6 +++++-
 2 files changed, 8 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
Evergreen ILS