[open-ils-commits] [GIT] Evergreen ILS branch rel_2_12 updated. d4b0cdb04f81d7962f80e80156ee5a261b8fb760

Evergreen Git git at git.evergreen-ils.org
Fri Oct 20 11:18:42 EDT 2017


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_2_12 has been updated
       via  d4b0cdb04f81d7962f80e80156ee5a261b8fb760 (commit)
      from  6f49f439d00f48301eefc86aedf2de8bc0a79d69 (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 d4b0cdb04f81d7962f80e80156ee5a261b8fb760
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 10348c4..bd732a5 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 9967ce3..75e6ec4 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
@@ -718,7 +718,11 @@ function($scope,  $q,  $location , $filter,  egCore,  egUser,  patronSvc) {
             $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


More information about the open-ils-commits mailing list