[open-ils-commits] [GIT] Evergreen ILS branch rel_3_2 updated. bb5163cb9ffa8269717898bccc84b5f3dab9aec3

[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, rel_3_2 has been updated
       via  bb5163cb9ffa8269717898bccc84b5f3dab9aec3 (commit)
       via  e38958fc2a0809e48416fd0ee06f2931ca6d4070 (commit)
      from  3be6ea2645b137b4f79361df58cf165c97584547 (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 bb5163cb9ffa8269717898bccc84b5f3dab9aec3
Author: Dan Wells <dbw2 at calvin.edu>
Date:   Fri Jun 21 11:36:44 2019 -0400

    LP#1759343 Clean up data seed values
    
    1) Add missing translation wrapper for new annotatepayment setting.
    
    2) While we are at it, try to stem the proliferation of workstation
    setting INSERT chunks.  (More could be done here...)
    
    Signed-off-by: Dan Wells <dbw2 at calvin.edu>
    Signed-off-by: Chris Sharp <csharp at georgialibraries.org>

diff --git a/Open-ILS/src/sql/Pg/950.data.seed-values.sql b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
index 399b4d1186..f956571d82 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -18485,6 +18485,13 @@ VALUES (
         'cwst', 'label'
     )
 ), (
+    'eg.circ.bills.annotatepayment', 'circ', 'bool',
+    oils_i18n_gettext(
+        'eg.circ.bills.annotatepayment',
+        'Bills: Annotate Payment',
+        'cwst', 'label'
+    )
+), (
     'circ.renew.strict_barcode', 'circ', 'bool',
     oils_i18n_gettext(
         'circ.renew.strict_barcode',
@@ -18555,6 +18562,13 @@ VALUES (
         'cwst', 'label'
     )
 ), (
+    'catalog.record.holds.prefetch', 'cat', 'bool',
+    oils_i18n_gettext(
+        'catalog.record.holds.prefetch',
+        'Pre-Fetch Record Holds',
+        'cwst', 'label'
+    )
+), (
     'eg.circ.patron.search.include_inactive', 'circ', 'bool',
     oils_i18n_gettext(
         'eg.circ.patron.search.include_inactive',
@@ -18863,6 +18877,13 @@ VALUES (
         'cwst', 'label'
     )
 ), (
+    'eg.grid.circ.patron.group_members', 'gui', 'object',
+    oils_i18n_gettext(
+        'eg.grid.circ.patron.group_members',
+        'Grid Config: circ.patron.group_members',
+        'cwst', 'label'
+    )
+), (
     'eg.grid.serials.mfhd_grid', 'gui', 'object',
     oils_i18n_gettext(
         'eg.grid.serials.mfhd_grid',
@@ -19457,16 +19478,3 @@ VALUES (
     oils_i18n_gettext(30, 'Generic Verify', 'cuat', 'label')
 );
 
-
-INSERT INTO config.workstation_setting_type
-    (name, grp, datatype, label)
-VALUES (
-    'eg.grid.circ.patron.group_members', 'gui', 'object',
-    oils_i18n_gettext(
-    'eg.grid.circ.patron.group_members',
-    'Grid Config: circ.patron.group_members',
-    'cwst', 'label')
-);
-
-INSERT INTO config.workstation_setting_type (name,label,grp,datatype)
-VALUES ('eg.circ.bills.annotatepayment','Bills: Annotate Payment', 'circ', 'bool');

commit e38958fc2a0809e48416fd0ee06f2931ca6d4070
Author: Dan Wells <dbw2 at calvin.edu>
Date:   Fri Jun 21 11:16:59 2019 -0400

    LP#1759343 Fix annotate payment setting name
    
    This setting was added to the database with the 'eg.' prefix, but in
    the code it was not used.  The end effect was that the setting likely
    worked, but was not saved in the way expected.
    
    This makes the setting name in the code match the DB.
    
    Signed-off-by: Dan Wells <dbw2 at calvin.edu>
    Signed-off-by: Chris Sharp <csharp at georgialibraries.org>

diff --git a/Open-ILS/web/js/ui/default/staff/circ/patron/bills.js b/Open-ILS/web/js/ui/default/staff/circ/patron/bills.js
index 495c85b245..308fb309ea 100644
--- a/Open-ILS/web/js/ui/default/staff/circ/patron/bills.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/patron/bills.js
@@ -200,7 +200,7 @@ function($scope , $q , $routeParams , egCore , egConfirmDialog , $location,
                     if (rcptOnPay) $scope.receipt_on_pay.isChecked = rcptOnPay;
                 });
 
-    egCore.hatch.getItem('circ.bills.annotatepayment')
+    egCore.hatch.getItem('eg.circ.bills.annotatepayment')
                 .then(function(annoPay){
                     if (annoPay) $scope.annotate_payment = annoPay;
                 });
@@ -412,7 +412,7 @@ function($scope , $q , $routeParams , egCore , egConfirmDialog , $location,
     }
 
     $scope.onAnnotatePaymentChanged = function(){
-        egCore.hatch.setItem('circ.bills.annotatepayment', $scope.annotate_payment);
+        egCore.hatch.setItem('eg.circ.bills.annotatepayment', $scope.annotate_payment);
     }
 
     function printReceipt(type, payment_ids, payments_made, note) {

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

Summary of changes:
 Open-ILS/src/sql/Pg/950.data.seed-values.sql       | 34 +++++++++++++---------
 .../web/js/ui/default/staff/circ/patron/bills.js   |  4 +--
 2 files changed, 23 insertions(+), 15 deletions(-)


hooks/post-receive
-- 
Evergreen ILS