[open-ils-commits] [GIT] Evergreen ILS branch rel_3_3 updated. e1e01fcd831c25265a3bd268d578422c9307016c
Evergreen Git
git at git.evergreen-ils.org
Fri Oct 4 10:39:45 EDT 2019
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 e1e01fcd831c25265a3bd268d578422c9307016c (commit)
via 55c0fd83e5555bbe6fca21f0f4626037cffa6a98 (commit)
via e3f9351e197a2af3af194c5a56420a57af156a7c (commit)
from cc403bf572c454461f8ef6e6697d8e0da90df20c (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 e1e01fcd831c25265a3bd268d578422c9307016c
Author: Galen Charlton <gmc at equinoxinitiative.org>
Date: Fri Oct 4 10:33:45 2019 -0400
LP#1729435: stamp DB update
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index bb2b8bd4fa..079e58c7ea 100644
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -92,7 +92,7 @@ CREATE TRIGGER no_overlapping_deps
BEFORE INSERT OR UPDATE ON config.db_patch_dependencies
FOR EACH ROW EXECUTE PROCEDURE evergreen.array_overlap_check ('deprecates');
-INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1191', :eg_version); -- miker/jeffdavis/sandbergja
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1193', :eg_version); -- remington/mmorgan/jpringle/gmcharlt
CREATE TABLE config.bib_source (
id SERIAL PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.circ-payment-detail-grid-persist-key.sql b/Open-ILS/src/sql/Pg/upgrade/1193.data.circ-payment-detail-grid-persist-key.sql
similarity index 89%
rename from Open-ILS/src/sql/Pg/upgrade/XXXX.data.circ-payment-detail-grid-persist-key.sql
rename to Open-ILS/src/sql/Pg/upgrade/1193.data.circ-payment-detail-grid-persist-key.sql
index 32ee3075f5..64c68bf38b 100644
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.circ-payment-detail-grid-persist-key.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/1193.data.circ-payment-detail-grid-persist-key.sql
@@ -1,6 +1,6 @@
BEGIN;
--- SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
+SELECT evergreen.upgrade_deps_block_check('1193', :eg_version);
INSERT INTO config.workstation_setting_type
(name, grp, datatype, label)
commit 55c0fd83e5555bbe6fca21f0f4626037cffa6a98
Author: Michele Morgan <mmorgan at noblenet.org>
Date: Fri Apr 5 16:55:19 2019 -0400
LP#1729435: Add Seed Data for WS type for Bill Full Details grids
Adds the config.workstation_setting_type values to the seed data and
an upgrade script to allow storing in the database.
Signed-off-by: Michele Morgan <mmorgan at noblenet.org>
Signed-off-by: Jennifer Pringle <jennifer.pringle at bc.libraries.coop>
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.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 8c0d5fd12e..f1442266f4 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -19974,3 +19974,18 @@ VALUES (
'cwst', 'label'
)
);
+
+INSERT INTO config.workstation_setting_type (name, grp, datatype, label)
+VALUES (
+ 'eg.grid.circ.patron.xact_details_details_bills', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.circ.patron.xact_details_details_bills',
+ 'Grid Config: circ.patron.xact_details_details_bills',
+ 'cwst', 'label')
+), (
+ 'eg.grid.circ.patron.xact_details_details_payments', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.circ.patron.xact_details_details_payments',
+ 'Grid Config: circ.patron.xact_details_details_payments',
+ 'cwst', 'label')
+);
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.circ-payment-detail-grid-persist-key.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.circ-payment-detail-grid-persist-key.sql
new file mode 100644
index 0000000000..32ee3075f5
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.circ-payment-detail-grid-persist-key.sql
@@ -0,0 +1,21 @@
+BEGIN;
+
+-- SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
+
+INSERT INTO config.workstation_setting_type
+ (name, grp, datatype, label)
+VALUES (
+ 'eg.grid.circ.patron.xact_details_details_bills', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.circ.patron.xact_details_details_bills',
+ 'Grid Config: circ.patron.xact_details_details_bills',
+ 'cwst', 'label')
+), (
+ 'eg.grid.circ.patron.xact_details_details_payments', 'gui', 'object',
+ oils_i18n_gettext(
+ 'eg.grid.circ.patron.xact_details_details_payments',
+ 'Grid Config: circ.patron.xact_details_details_payments',
+ 'cwst', 'label')
+);
+
+COMMIT;
commit e3f9351e197a2af3af194c5a56420a57af156a7c
Author: Remington Steed <rjs7 at calvin.edu>
Date: Mon Nov 5 16:11:35 2018 -0500
LP#1729435: Allow saving Bill Full Details grids
For a web staff eg-grid to save and retrieve its settings, it needs a unique
persist-key. This commit adds one for the Bills grid and Payments grid on the
patron bills Full Details view (right-click a bill, choose Full Details, then
click the Details tab).
Signed-off-by: Remington Steed <rjs7 at calvin.edu>
Signed-off-by: Michele Morgan <mmorgan at noblenet.org>
Signed-off-by: Jennifer Pringle <jennifer.pringle at bc.libraries.coop>
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
diff --git a/Open-ILS/src/templates/staff/circ/patron/t_xact_details_details.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_xact_details_details.tt2
index 6cd026a801..1887cbecb1 100644
--- a/Open-ILS/src/templates/staff/circ/patron/t_xact_details_details.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_xact_details_details.tt2
@@ -8,6 +8,7 @@
grid-controls="xactGridControls"
auto-fields="true"
page-size="10"
+ persist-key="circ.patron.xact_details_details_bills"
dateformat="{{$root.egDateAndTimeFormat}}">
<eg-grid-action
@@ -28,6 +29,7 @@
id-field="id"
grid-controls="paymentGridControls"
page-size="10"
+ persist-key="circ.patron.xact_details_details_payments"
dateformat="{{$root.egDateAndTimeFormat}}">
<eg-grid-action
label="[% l('Edit Note') %]" handler="editPaymentNotes"></eg-grid-action>
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/src/sql/Pg/002.schema.config.sql | 2 +-
Open-ILS/src/sql/Pg/950.data.seed-values.sql | 15 +++++++++++++++
...93.data.circ-payment-detail-grid-persist-key.sql | 21 +++++++++++++++++++++
.../staff/circ/patron/t_xact_details_details.tt2 | 2 ++
4 files changed, 39 insertions(+), 1 deletion(-)
create mode 100644 Open-ILS/src/sql/Pg/upgrade/1193.data.circ-payment-detail-grid-persist-key.sql
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list