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

[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  6a419183bb15214c35832026e55aa859b094f724 (commit)
       via  0da274fa83854c8a73715dffa3e83c1785ee4c9d (commit)
      from  84bdddded10142b178d64527ced69af3020778fa (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 6a419183bb15214c35832026e55aa859b094f724
Author: Michele Morgan <mmorgan at noblenet.org>
Date:   Wed May 16 10:50:59 2018 -0400

    LP#1745422 - Removed three commented out lines from the code and signoff.
    
    Signed-off-by: Michele Morgan <mmorgan at noblenet.org>
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>

diff --git a/Open-ILS/src/templates/staff/circ/share/t_hold_details.tt2 b/Open-ILS/src/templates/staff/circ/share/t_hold_details.tt2
index 5edd4b3..a1c47c2 100644
--- a/Open-ILS/src/templates/staff/circ/share/t_hold_details.tt2
+++ b/Open-ILS/src/templates/staff/circ/share/t_hold_details.tt2
@@ -11,9 +11,6 @@
 <div class="flex-row">
   <div class="flex-cell">[% l('Hold Type') %]</div>
   <div class="flex-cell well">{{hold.hold_type()}}<span ng-if="hold.hold_type() == 'P'"> - {{part.label()}}</span></div>
-  <!-- adding another cell messes up 3 column grid -->
-  <!-- <div ng-if="hold.hold_type() == 'P'" class="flex-cell">[% l('Part') %]</div> -->
-  <!-- <div ng-if="hold.hold_type() == 'P'" class="flex-cell well">{{part.label()}}</div> -->
   <div class="flex-cell">[% l('Current Copy') %]</div>
   <div class="flex-cell well">
     <a href="./cat/item/{{hold.current_copy().id()}}" target="_self">

commit 0da274fa83854c8a73715dffa3e83c1785ee4c9d
Author: Cesar Velez <cesar.velez at equinoxinitiative.org>
Date:   Fri Feb 16 11:01:23 2018 -0500

    LP#1745422 - Add Parts column to Patron holds grids and detail view
    
    The webstaff's patron ui did not have a display for the Part,
    which will be fetched for any hold type "P" (monographic part).
    This adds a Part column to the hold grids and inthe detail view
    IF the hold type is P, it'll append the part.label in the same
    field/well.
    
    Signed-off by: Cesar Velez <cesar.velez at equinoxinitiative.org>
    
    Signed-off-by: Michele Morgan <mmorgan at noblenet.org>
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>

diff --git a/Open-ILS/src/templates/staff/circ/patron/t_holds_list.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_holds_list.tt2
index 65fb234..9c8962e 100644
--- a/Open-ILS/src/templates/staff/circ/patron/t_holds_list.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_holds_list.tt2
@@ -85,6 +85,7 @@
   <eg-grid-field path='hold.requestor.id' parent-idl-class="ahr" label="[% l('Requestor ID') %]" hidden></eg-grid-field>
   <eg-grid-field path='hold.requestor.usrname' parent-idl-class="ahr" label="[% l('Requestor Username') %]" hidden></eg-grid-field>
 
+  <eg-grid-field path='part.label' parent-idl-class="bmp" label="[% l('Part') %]" hidden></eg-grid-field>
   <eg-grid-field path='volume.*' parent-idl-class="acn" hidden></eg-grid-field>
   <eg-grid-field path='mvr.*' parent-idl-class="mvr" hidden></eg-grid-field>
 </eg-grid>
diff --git a/Open-ILS/src/templates/staff/circ/share/t_hold_details.tt2 b/Open-ILS/src/templates/staff/circ/share/t_hold_details.tt2
index 27ab8ec..5edd4b3 100644
--- a/Open-ILS/src/templates/staff/circ/share/t_hold_details.tt2
+++ b/Open-ILS/src/templates/staff/circ/share/t_hold_details.tt2
@@ -10,7 +10,10 @@
  </div>
 <div class="flex-row">
   <div class="flex-cell">[% l('Hold Type') %]</div>
-  <div class="flex-cell well">{{hold.hold_type()}}</div>
+  <div class="flex-cell well">{{hold.hold_type()}}<span ng-if="hold.hold_type() == 'P'"> - {{part.label()}}</span></div>
+  <!-- adding another cell messes up 3 column grid -->
+  <!-- <div ng-if="hold.hold_type() == 'P'" class="flex-cell">[% l('Part') %]</div> -->
+  <!-- <div ng-if="hold.hold_type() == 'P'" class="flex-cell well">{{part.label()}}</div> -->
   <div class="flex-cell">[% l('Current Copy') %]</div>
   <div class="flex-cell well">
     <a href="./cat/item/{{hold.current_copy().id()}}" target="_self">

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

Summary of changes:
 .../templates/staff/circ/patron/t_holds_list.tt2   |    1 +
 .../templates/staff/circ/share/t_hold_details.tt2  |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Evergreen ILS