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

[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  8f88f6892cf4163fdc6c9ad26cd8f83364832ef8 (commit)
       via  6c986199119358774a444cc8c36e43ef483d1a7b (commit)
      from  47472b2468519769d0d0c7d9c34ef4b551d6fa6d (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 8f88f6892cf4163fdc6c9ad26cd8f83364832ef8
Author: Remington Steed <rjs7 at calvin.edu>
Date:   Tue May 28 09:33:44 2019 -0400

    LP#1741980: Give type label its own span and class for easy hiding
    
    This commit separates the copy tag type label into its own span with a
    new class "copy_tag_type_label", so that libraries can hide it or style
    it differently. Release notes are included.
    
    Signed-off-by: Remington Steed <rjs7 at calvin.edu>
    Signed-off-by: Kyle Huckins <khuckins at catalyte.io>
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>

diff --git a/Open-ILS/src/templates/opac/parts/record/copy_table.tt2 b/Open-ILS/src/templates/opac/parts/record/copy_table.tt2
index 14c2d70ca2..9d126f6444 100644
--- a/Open-ILS/src/templates/opac/parts/record/copy_table.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/copy_table.tt2
@@ -236,11 +236,12 @@ END; # FOREACH bib
                 <tr class="copy_tag_row">
                     <td> </td>
                     <td class="copy_tag" colspan="4">
+                        <span class="copy_tag_type_label">[% tag.tag_type.label _ ": " | html %]</span>
                         <span class="copy_tag_value">
                             [% IF tag.url %]
                             <a href="[% tag.url | html %]">
                             [% END %]
-                                [% tag.tag_type.label _ ": " _ tag.value | html %]
+                                [% tag.value | html %]
                             [% IF tag.url %]
                             </a>
                             [% END %]
diff --git a/docs/RELEASE_NOTES_NEXT/OPAC/copy_tag_display_includes_type.adoc b/docs/RELEASE_NOTES_NEXT/OPAC/copy_tag_display_includes_type.adoc
new file mode 100644
index 0000000000..d26d3b20de
--- /dev/null
+++ b/docs/RELEASE_NOTES_NEXT/OPAC/copy_tag_display_includes_type.adoc
@@ -0,0 +1,12 @@
+Item Tags Now Display Tag Type Labels
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+When item tags display in the catalog, they will now include the label from the
+item tag type.  For example, for a tag of type "Digital Bookplate", here is a
+comparison of the old and new display:
+
+ * Old output: "(Tag Value Here)"
+ * New output: "Digital Bookplate: (Tag Value Here)"
+
+The type label is wrapped in a new CSS class `copy_tag_type_label` that allows
+it to be styled separately from the tag value or hidden entirely.
+

commit 6c986199119358774a444cc8c36e43ef483d1a7b
Author: Remington Steed <rjs7 at calvin.edu>
Date:   Wed Apr 24 09:37:22 2019 -0400

    LP#1741980: Fetch and show copy tag label in OPAC
    
    When copy/item tags (such as "Digital Bookplate") are displayed in the
    OPAC, they currently only show the tag's value, but not the label of the
    tags type. This commit fleshes in the tag type so we gain access to the
    type's label, and it adds it to the OPAC display.
    
    OPAC output before: "(Tag Value Here)"
    
    OPAC output after: "Digital Bookplate: (Tag Value Here)"
    
    Signed-off-by: Remington Steed <rjs7 at calvin.edu>
    Signed-off-by: Garry Collum <gcollum at gmail.com>
    Signed-off-by: Kyle Huckins <khuckins at catalyte.io>
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ.pm
index 0dfebd3bf6..3c40e2dabc 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ.pm
@@ -1109,7 +1109,11 @@ sub fetch_copy_tags {
         }
     };
 
-    return $e->search_asset_copy_tag([$filter, { join => { acptcm => {} } }]);
+    return $e->search_asset_copy_tag([$filter, {
+        join => { acptcm => {} },
+        flesh => 1,
+        flesh_fields => { acpt => ['tag_type'] }
+    }]);
 }
 
 
diff --git a/Open-ILS/src/templates/opac/parts/record/copy_table.tt2 b/Open-ILS/src/templates/opac/parts/record/copy_table.tt2
index 1c7a2de0dd..14c2d70ca2 100644
--- a/Open-ILS/src/templates/opac/parts/record/copy_table.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/copy_table.tt2
@@ -240,7 +240,7 @@ END; # FOREACH bib
                             [% IF tag.url %]
                             <a href="[% tag.url | html %]">
                             [% END %]
-                                [% tag.value | html %]
+                                [% tag.tag_type.label _ ": " _ tag.value | html %]
                             [% IF tag.url %]
                             </a>
                             [% END %]

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

Summary of changes:
 Open-ILS/src/perlmods/lib/OpenILS/Application/Circ.pm        |  6 +++++-
 Open-ILS/src/templates/opac/parts/record/copy_table.tt2      |  1 +
 .../OPAC/copy_tag_display_includes_type.adoc                 | 12 ++++++++++++
 3 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 docs/RELEASE_NOTES_NEXT/OPAC/copy_tag_display_includes_type.adoc


hooks/post-receive
-- 
Evergreen ILS