[open-ils-commits] [GIT] Evergreen ILS branch rel_3_3 updated. 0d5d5465ecefe7e71d5250aa603e56936d399ee6

[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_3 has been updated
       via  0d5d5465ecefe7e71d5250aa603e56936d399ee6 (commit)
       via  46833c6646cc678a7e4b3990ed225a11c2412415 (commit)
      from  45fb062fbd59ec2ef6c124dd5841040c3291dc2f (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 0d5d5465ecefe7e71d5250aa603e56936d399ee6
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 37df5586d1..81620b8b7d 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',
@@ -18863,6 +18870,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',
@@ -19956,16 +19970,3 @@ VALUES (
         'cwst', '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 46833c6646cc678a7e4b3990ed225a11c2412415
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       | 27 +++++++++++-----------
 .../web/js/ui/default/staff/circ/patron/bills.js   |  4 ++--
 2 files changed, 16 insertions(+), 15 deletions(-)


hooks/post-receive
-- 
Evergreen ILS