[open-ils-commits] [GIT] Evergreen ILS branch master updated. 4640519ec3716a6411a5f982b2cae4a19470a100

[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  4640519ec3716a6411a5f982b2cae4a19470a100 (commit)
       via  0e275ea4d72e34b86b0445a378588afc1a332f85 (commit)
       via  5169b973f00626522b274934c386cce5eb632fa7 (commit)
      from  3d39064bb775498ad66898822325fac8ffa5559b (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 4640519ec3716a6411a5f982b2cae4a19470a100
Author: Galen Charlton <gmc at equinoxinitiative.org>
Date:   Thu Jul 30 10:26:36 2020 -0400

    LP#1754110: (follow-up) release notes tweak
    
    Update the release notes to indicate which staff
    client template one would typically customize to
    make use of this feature.
    
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>

diff --git a/docs/RELEASE_NOTES_NEXT/API/draw_field_label_improvements.adoc b/docs/RELEASE_NOTES_NEXT/API/draw_field_label_improvements.adoc
index 75ca605be6..10eefcd48f 100644
--- a/docs/RELEASE_NOTES_NEXT/API/draw_field_label_improvements.adoc
+++ b/docs/RELEASE_NOTES_NEXT/API/draw_field_label_improvements.adoc
@@ -6,3 +6,5 @@ the draw_field_label macro). By default,
 draw_field_label uses the label of supplied IDL field class. 
 Now a developer may supply an additional third parameter,
 label_override, which overrides the default IDL-based label.
+This would typically be done in the course of customizing
+the web staff client template `circ/patron/t_edit.tt2`.

commit 0e275ea4d72e34b86b0445a378588afc1a332f85
Author: Kyle Huckins <khuckins at catalyte.io>
Date:   Tue Sep 11 17:38:01 2018 +0000

    lp1754110 Patron Reg Field Label Override Release Notes
    
    - Add release notes for improvements to draw_field_label
    
    Signed-off-by: Kyle Huckins <khuckins at catalyte.io>
    Signed-off-by: Jane Sandberg <sandbej at linnbenton.edu>
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>

diff --git a/docs/RELEASE_NOTES_NEXT/API/draw_field_label_improvements.adoc b/docs/RELEASE_NOTES_NEXT/API/draw_field_label_improvements.adoc
new file mode 100644
index 0000000000..75ca605be6
--- /dev/null
+++ b/docs/RELEASE_NOTES_NEXT/API/draw_field_label_improvements.adoc
@@ -0,0 +1,8 @@
+Override Label for draw_field_label Patron Edit Fields
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Evergreen developers may now specify a label for fields in
+the patron registration/patron edit form (generated by
+the draw_field_label macro). By default, 
+draw_field_label uses the label of supplied IDL field class. 
+Now a developer may supply an additional third parameter,
+label_override, which overrides the default IDL-based label.

commit 5169b973f00626522b274934c386cce5eb632fa7
Author: Kyle Huckins <khuckins at catalyte.io>
Date:   Wed Mar 7 17:47:23 2018 +0000

    LP#1754110 Patron Reg. Field Label Override
    
    Supply additional parameter to draw_field_label macro to
    apply custom labels to patron reg/edit fields.
    
    Signed-off-by: Kyle Huckins <khuckins at catalyte.io>
    Signed-off-by: Jane Sandberg <sandbej at linnbenton.edu>
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>

diff --git a/Open-ILS/src/templates/staff/circ/patron/t_edit.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_edit.tt2
index 1c66575c1b..2fff639b67 100644
--- a/Open-ILS/src/templates/staff/circ/patron/t_edit.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_edit.tt2
@@ -92,9 +92,13 @@
   </div>
 </div>
 
-[% MACRO draw_field_label (cls, field) BLOCK %]
+[%
+# draws a label for inputs based on the idl class's field's
+# label OR a supplied string
+MACRO draw_field_label (cls, field, label_override) BLOCK %]
   <div class="col-md-3 reg-field-label"> <!-- field label -->
-    <label>{{idl_fields.[% cls %].[% field %].label}}</label>
+    [% IF label_override %]<label>[% label_override %]</label>
+    [% ELSE %]<label>{{idl_fields.[% cls %].[% field %].label}}</label>[% END %]
     <!-- field documentation img/link -->
     <img ng-show="field_doc.[% cls %].[% field %]" 
       ng-click="set_selected_field_doc('[% cls %]','[% field %]')"

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

Summary of changes:
 Open-ILS/src/templates/staff/circ/patron/t_edit.tt2            |  8 ++++++--
 docs/RELEASE_NOTES_NEXT/API/draw_field_label_improvements.adoc | 10 ++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 docs/RELEASE_NOTES_NEXT/API/draw_field_label_improvements.adoc


hooks/post-receive
-- 
Evergreen ILS