[open-ils-commits] [GIT] Evergreen ILS branch master updated. 5f1c1b0d29870f9f3f66313f699631e0aa37ca19

[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  5f1c1b0d29870f9f3f66313f699631e0aa37ca19 (commit)
       via  aad51f17a2b3d1b7d4ac3af6bbd2d51e148dff2f (commit)
      from  6d5e44f845364e104f8460385864861d6689cc5a (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 5f1c1b0d29870f9f3f66313f699631e0aa37ca19
Author: Kathy Lussier <klussier at masslnc.org>
Date:   Tue May 15 15:47:56 2018 -0400

    LP#1738893: Release notes entry for batch edit stat cat fix
    
    Adding release notes entry since the initial maintenance release notes
    have already been done.
    
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>

diff --git a/docs/RELEASE_NOTES_3_0.adoc b/docs/RELEASE_NOTES_3_0.adoc
index b090476..2cd0f0e 100644
--- a/docs/RELEASE_NOTES_3_0.adoc
+++ b/docs/RELEASE_NOTES_3_0.adoc
@@ -53,6 +53,9 @@ parameters.
 detects an existing lock file.
 * The 3.0.2-3.0.3 upgrade script disables triggers before
 recalculating bib visibility.
+* Fixes an issue where multiple copies with different values for required
+statistical categories could not be edited and saved in batch.
+
 
 Acknowledgements
 ~~~~~~~~~~~~~~~~
diff --git a/docs/RELEASE_NOTES_3_1.adoc b/docs/RELEASE_NOTES_3_1.adoc
index b30fc39..4e24cca 100644
--- a/docs/RELEASE_NOTES_3_1.adoc
+++ b/docs/RELEASE_NOTES_3_1.adoc
@@ -58,6 +58,8 @@ detects an existing lock file.
 no longer relies on capitalization.
 * The 3.0.2-3.0.3 upgrade script disables triggers before
 recalculating bib visibility.
+* Fixes an issue where multiple copies with different values for required
+statistical categories could not be edited and saved in batch.
 
 Acknowledgements
 ~~~~~~~~~~~~~~~~

commit aad51f17a2b3d1b7d4ac3af6bbd2d51e148dff2f
Author: Cesar Velez <cesar.velez at equinoxinitiative.org>
Date:   Mon Apr 30 15:12:53 2018 -0400

    LP#1738893-allow saving required statcats in multi record vol-copy edit
    
    This change allows the user to set a required stat cat for multiple
    record copies in the Volcopy editor.
    
    Signed-off-by: Cesar Velez <cesar.velez at equinoxinitiative.org>
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>

diff --git a/Open-ILS/src/templates/staff/cat/volcopy/t_attr_edit.tt2 b/Open-ILS/src/templates/staff/cat/volcopy/t_attr_edit.tt2
index aebd2be..d1a692c 100644
--- a/Open-ILS/src/templates/staff/cat/volcopy/t_attr_edit.tt2
+++ b/Open-ILS/src/templates/staff/cat/volcopy/t_attr_edit.tt2
@@ -446,7 +446,7 @@
                                 ng-change="statcatUpdate(sc.id())"
                                 ng-model="working.statcats[sc.id()]"
                                 ng-options="e.id() as e.value() for e in sc.entries()"
-                                ng-required="sc.required() == 't'">
+                                ng-required="sc.required() == 't' && !working.statcats_multi[sc.id()]">
                                 <option value="">
                                     {{ !working.statcats_multi[sc.id()] ? '[% l('<NONE>') %]' : '[% l('<MULTIPLE>') %]' }}
                                 </option>

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

Summary of changes:
 .../templates/staff/cat/volcopy/t_attr_edit.tt2    |    2 +-
 docs/RELEASE_NOTES_3_0.adoc                        |    3 +++
 docs/RELEASE_NOTES_3_1.adoc                        |    2 ++
 3 files changed, 6 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Evergreen ILS