[open-ils-commits] [GIT] Evergreen ILS branch master updated. 59136d13f11c5db351277c7b9932774d2df7d6ac

[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  59136d13f11c5db351277c7b9932774d2df7d6ac (commit)
       via  0213f3ab58abdf2afcc502f12a97807c842fafd9 (commit)
      from  fa69633a2d7bfc29be1703c70d8b83c370d3fe57 (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 59136d13f11c5db351277c7b9932774d2df7d6ac
Author: Galen Charlton <gmc at equinoxinitiative.org>
Date:   Wed May 22 14:57:52 2019 -0400

    LP#1776003: show codes throughout the Physical Characteristics Wizard
    
    This patch extends on the previous one to show the code (as well as the
    label) in all drop-downs used in the Physical Characteristics Wizard. It
    also makes the drop-down text accessible for translations, in case there
    are any locales where "code: label" is not preferred.
    
    This patch also adds release notes.
    
    To test
    -------
    [1] Apply the patches and use the web staff MARC editor to edit or
        create an 007 field, then use the Physical Characteristics Wizard.
    [2] Verify that the drop-downs now display both the code and the label
        for each value.
    
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
    Signed-off-by: Jane Sandberg <sandbej at linnbenton.edu>

diff --git a/Open-ILS/src/templates/staff/cat/share/t_physchar_wizard.tt2 b/Open-ILS/src/templates/staff/cat/share/t_physchar_wizard.tt2
index b94374cb5a..2f1c26ce37 100644
--- a/Open-ILS/src/templates/staff/cat/share/t_physchar_wizard.tt2
+++ b/Open-ILS/src/templates/staff/cat/share/t_physchar_wizard.tt2
@@ -10,14 +10,14 @@
       <div class="col-md-4">
         <div class="btn-group" uib-dropdown>
           <button type="button" class="btn btn-default" uib-dropdown-toggle>
-           <span style="padding-right: 5px;" ng-if="selected_option">{{selected_option.label()}}</span>
+           <span style="padding-right: 5px;" ng-if="selected_option">[% l('[_1]: [_2]', '{{selected_option.ptype_key()}}', '{{selected_option.label()}}') %]</span>
            <span style="padding-right: 5px;" ng-if="!selected_option">[% l('<unset>') | html %]</span>
            <span class="caret"></span>
          </button>
          <ul uib-dropdown-menu>
            <li ng-repeat="option in values_for_step">
              <a href ng-click="change_ptype(option)">
-              {{option.ptype_key()}}: {{option.label()}}
+              [% l('[_1]: [_2]', '{{option.ptype_key()}}', '{{option.label()}}') %]
              </a>
            </li>
          </ul>
@@ -29,14 +29,14 @@
       <div class="col-md-6">
         <div class="btn-group" uib-dropdown>
           <button type="button" class="btn btn-default" uib-dropdown-toggle>
-           <span style="padding-right: 5px;" ng-if="selected_option">{{selected_option.label()}}</span>
+           <span style="padding-right: 5px;" ng-if="selected_option">[% l('[_1]: [_2]', '{{selected_option.value()}}', '{{selected_option.label()}}') %]</span>
            <span style="padding-right: 5px;" ng-if="!selected_option">[% l('<unset>') | html %]</span>
            <span class="caret"></span>
          </button>
          <ul uib-dropdown-menu>
            <li ng-repeat="option in values_for_step">
              <a href ng-click="change_option(option)">
-              {{option.label()}}
+              [% l('[_1]: [_2]', '{{option.value()}}', '{{option.label()}}') %]
              </a>
            </li>
          </ul>
diff --git a/docs/RELEASE_NOTES_NEXT/Cataloging/Show_Codes_in_Physical_Characteristics_Wizard.adoc b/docs/RELEASE_NOTES_NEXT/Cataloging/Show_Codes_in_Physical_Characteristics_Wizard.adoc
new file mode 100644
index 0000000000..f15ced748b
--- /dev/null
+++ b/docs/RELEASE_NOTES_NEXT/Cataloging/Show_Codes_in_Physical_Characteristics_Wizard.adoc
@@ -0,0 +1,4 @@
+Display Codes in Physical Characteristics Wizard Drop-downs (LP#1776003)
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Drop-downs in the Physical Characteristics Wizard in the MARC editor
+now display both code and label.

commit 0213f3ab58abdf2afcc502f12a97807c842fafd9
Author: a. bellenir <ab at grpl.org>
Date:   Thu Aug 23 15:42:28 2018 -0400

    LP#1776003: Show MARC Code in 'Category of Material' in Physical Characteristics Wizard
    
    display the ptype_key from the marc21_physical_characteristic_type_map (cmpctm)
    alongside the label in the physical characteristics wizard
    
    Signed-off-by: a. bellenir <ab at grpl.org>
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
    Signed-off-by: Jane Sandberg <sandbej at linnbenton.edu>

diff --git a/Open-ILS/src/templates/staff/cat/share/t_physchar_wizard.tt2 b/Open-ILS/src/templates/staff/cat/share/t_physchar_wizard.tt2
index 1f2e06ea8b..b94374cb5a 100644
--- a/Open-ILS/src/templates/staff/cat/share/t_physchar_wizard.tt2
+++ b/Open-ILS/src/templates/staff/cat/share/t_physchar_wizard.tt2
@@ -17,7 +17,7 @@
          <ul uib-dropdown-menu>
            <li ng-repeat="option in values_for_step">
              <a href ng-click="change_ptype(option)">
-              {{option.label()}}
+              {{option.ptype_key()}}: {{option.label()}}
              </a>
            </li>
          </ul>

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

Summary of changes:
 Open-ILS/src/templates/staff/cat/share/t_physchar_wizard.tt2      | 8 ++++----
 .../Cataloging/Show_Codes_in_Physical_Characteristics_Wizard.adoc | 4 ++++
 2 files changed, 8 insertions(+), 4 deletions(-)
 create mode 100644 docs/RELEASE_NOTES_NEXT/Cataloging/Show_Codes_in_Physical_Characteristics_Wizard.adoc


hooks/post-receive
-- 
Evergreen ILS