From e6c6b1a4f0ff6bc0729625ecaa8c510facef8398 Mon Sep 17 00:00:00 2001
From: Jane Sandberg <sandbej@linnbenton.edu>
Date: Mon, 12 Jul 2021 20:56:01 -0700
Subject: [PATCH] LP1935693: Add circulation modifier to course page

Also makes some strings extractable for translation that
were previously missed.

To test:
1) Enable the course materials module
2) Add some courses
3) Add some materials to those courses, using a mix of
circulation modifiers
4) In the OPAC, use the Course Search to search for
your courses
5) Click on the course you created
6) Note that physical items associated with the course
display their circulation modifiers in the circulation
modifier column.

Signed-off-by: Jane Sandberg <sandbej@linnbenton.edu>
Signed-off-by: Beth Willis <willis@noblenet.org>
Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
Signed-off-by: Galen Charlton <gmc@equinoxOLI.org>
---
 .../src/perlmods/lib/OpenILS/Application/Courses.pm  |  2 +-
 Open-ILS/src/templates/opac/parts/course/body.tt2    | 20 +++++++++++++-------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Courses.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Courses.pm
index c052ac8a88..6e7c7528d7 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Courses.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Courses.pm
@@ -131,7 +131,7 @@ sub fetch_course_materials {
             'flesh' => 2, 'flesh_fields' => {
                 'acmcm' => ['item', 'record', 'original_circ_modifier',
                     'original_location', 'original_status'],
-                'acp' => ['call_number', 'circ_lib', 'location', 'status'],
+                'acp' => ['call_number', 'circ_lib', 'circ_modifier', 'location', 'status'],
                 'bre' => ['wide_display_entry'],
             }
         };
diff --git a/Open-ILS/src/templates/opac/parts/course/body.tt2 b/Open-ILS/src/templates/opac/parts/course/body.tt2
index e80cea059a..24364b9ba7 100644
--- a/Open-ILS/src/templates/opac/parts/course/body.tt2
+++ b/Open-ILS/src/templates/opac/parts/course/body.tt2
@@ -66,13 +66,14 @@
         <table class="table_no_border_space table_no_cell_pad table_no_border" width="100%" id="course_material_table">
           <thead>
             <tr>
-              <th scope="col">Location</th>
-              <th scope="col">Call Number</th>
-              <th scope="col">Title</th>
-              <th scope="col">Barcode</th>
-              <th scope="col">Relationship</th>
-              <th scope="col">Status</th>
-              <th scope="col">Shelving Location</th>
+              <th scope="col">[% l('Location') %]</th>
+              <th scope="col">[% l('Call Number') %]</th>
+              <th scope="col">[% l('Title') %]</th>
+              <th scope="col">[% l('Barcode') %]</th>
+              <th scope="col">[% l('Relationship') %]</th>
+              <th scope="col">[% l('Status') %]</th>
+              <th scope="col">[% l('Shelving Location') %]</th>
+              <th scope="col">[% l('Circulation Modifier') %]</th>
             </tr>
           </thead>
           <tbody>
@@ -114,6 +115,11 @@
                     [% material.item.location.name %]
                   [% END %]
                 </td>
+                <td>
+                  [% IF material.item %]
+                    [% material.item.circ_modifier.name %]
+                  [% END %]
+                </td>
               </tr>
             [% END %]
           </tbody>
-- 
2.11.0