[open-ils-commits] [GIT] Evergreen ILS branch master updated. 96b1d32ccec2c01631ea8a39b72e89b6f1880aac
Evergreen Git
git at git.evergreen-ils.org
Mon Aug 7 16:38:17 EDT 2017
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 96b1d32ccec2c01631ea8a39b72e89b6f1880aac (commit)
via 3ad807fd108a5975d8462cceaac24710109d1ef5 (commit)
via ad9f052688f3be18dd0b8829ab449cac5d810ee9 (commit)
via 838f30e150dd1c589ed9a2cb7dc8494b467c63de (commit)
via 27cec68fcf4f93090e75b97630f8ff204a89f8fc (commit)
from 98fc4aff6296411de4f1365ef21ea44d635ccf62 (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 96b1d32ccec2c01631ea8a39b72e89b6f1880aac
Author: Galen Charlton <gmc at equinoxinitiative.org>
Date: Mon Aug 7 16:52:04 2017 -0400
LP#1681095: (follow-up) fix a template syntax error
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
diff --git a/Open-ILS/src/templates/opac/parts/ebook_api/base_js.tt2 b/Open-ILS/src/templates/opac/parts/ebook_api/base_js.tt2
index d82cd78..538de71 100644
--- a/Open-ILS/src/templates/opac/parts/ebook_api/base_js.tt2
+++ b/Open-ILS/src/templates/opac/parts/ebook_api/base_js.tt2
@@ -1,6 +1,6 @@
[%
# HTML display chunks
-progress_icon = '<img id="ebook_avail_spinner" src="/opac/images/progressbar_green.gif[% ctx.cache_key %]" alt="' _ l("Checking availability for this item...") _ '"/>'
+progress_icon = '<img id="ebook_avail_spinner" src="/opac/images/progressbar_green.gif' _ ctx.cache_key _ '" alt="' _ l("Checking availability for this item...") _ '"/>'
%]
<script type="text/javascript" src="[% ctx.media_prefix %]/js/ui/default/opac/ebook_api/session.js[% ctx.cache_key %]"></script>
commit 3ad807fd108a5975d8462cceaac24710109d1ef5
Author: Galen Charlton <gmc at equinoxinitiative.org>
Date: Mon Aug 7 16:49:17 2017 -0400
LP#1075401: add release notes entry
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
diff --git a/docs/RELEASE_NOTES_NEXT/Administration/misc.adoc b/docs/RELEASE_NOTES_NEXT/Administration/misc.adoc
index 10c7949..b89b66c 100644
--- a/docs/RELEASE_NOTES_NEXT/Administration/misc.adoc
+++ b/docs/RELEASE_NOTES_NEXT/Administration/misc.adoc
@@ -4,3 +4,8 @@ Miscellaneous Improvements
* If a filter is in effect in the Library Settings Editor,
changing the selected library now results in the filter
continuing to be applied.
+ * Copy templates used for serials now correct link to age
+ protection rules and MARC item type values (for the
+ "Circ as Type" field). During upgrade, the database update
+ will set to NULL any age protection and circ as type fields
+ in serial copy templates that do not point to defined values.
commit ad9f052688f3be18dd0b8829ab449cac5d810ee9
Author: Galen Charlton <gmc at equinoxinitiative.org>
Date: Mon Aug 7 16:44:32 2017 -0400
LP#1075401: 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 a928378..6cc41db 100644
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -90,7 +90,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 ('1048', :eg_version); -- phasefx/berick
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1049', :eg_version); -- mmorgan/stompro/gmcharlt
CREATE TABLE config.bib_source (
id SERIAL PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.nullify_invalid_act.age_protect_act.circ_as_type.sql b/Open-ILS/src/sql/Pg/upgrade/1049.data.nullify_invalid_act.age_protect_act.circ_as_type.sql
similarity index 91%
rename from Open-ILS/src/sql/Pg/upgrade/XXXX.data.nullify_invalid_act.age_protect_act.circ_as_type.sql
rename to Open-ILS/src/sql/Pg/upgrade/1049.data.nullify_invalid_act.age_protect_act.circ_as_type.sql
index 7eafe11..5177b6d 100644
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.nullify_invalid_act.age_protect_act.circ_as_type.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/1049.data.nullify_invalid_act.age_protect_act.circ_as_type.sql
@@ -1,6 +1,6 @@
BEGIN;
--- SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
+SELECT evergreen.upgrade_deps_block_check('1049', :eg_version); -- mmorgan/stompro/gmcharlt
\echo -----------------------------------------------------------
\echo Setting invalid age_protect and circ_as_type entries to NULL,
commit 838f30e150dd1c589ed9a2cb7dc8494b467c63de
Author: Michele Morgan <mmorgan at noblenet.org>
Date: Mon Jul 3 14:49:42 2017 -0400
LP 1075401 - Upgrade script to nullify existing bad data
Sets to NULL any entries in asset.copy_template.age_protect and
asset.copy_template.circ_as_type that are not valid values.
Signed-off-by: Michele Morgan <mmorgan at noblenet.org>
Signed-off-by: Josh Stompro <stomproj at larl.org>
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.nullify_invalid_act.age_protect_act.circ_as_type.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.nullify_invalid_act.age_protect_act.circ_as_type.sql
new file mode 100644
index 0000000..7eafe11
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.nullify_invalid_act.age_protect_act.circ_as_type.sql
@@ -0,0 +1,35 @@
+BEGIN;
+
+-- SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
+
+\echo -----------------------------------------------------------
+\echo Setting invalid age_protect and circ_as_type entries to NULL,
+\echo otherwise they will break the Serial Copy Templates editor.
+\echo Please review any Serial Copy Templates listed below.
+\echo
+UPDATE asset.copy_template act
+SET age_protect = NULL
+FROM actor.org_unit aou
+WHERE aou.id=act.owning_lib
+ AND act.age_protect NOT IN
+ (
+ SELECT id FROM config.rule_age_hold_protect
+ )
+RETURNING act.id "Template ID", act.name "Template Name",
+ aou.shortname "Owning Lib",
+ 'Age Protection value reset to null.' "Description";
+
+UPDATE asset.copy_template act
+SET circ_as_type = NULL
+FROM actor.org_unit aou
+WHERE aou.id=act.owning_lib
+ AND act.circ_as_type NOT IN
+ (
+ SELECT code FROM config.item_type_map
+ )
+RETURNING act.id "Template ID", act.name "Template Name",
+ aou.shortname "Owning Lib",
+ 'Circ as Type value reset to null.' as "Description";
+
+\echo -----------End Serial Template Fix----------------
+COMMIT;
commit 27cec68fcf4f93090e75b97630f8ff204a89f8fc
Author: Michele Morgan <mmorgan at noblenet.org>
Date: Tue Apr 18 12:11:01 2017 -0400
LP#1075401: adjust two fields in the legacy Serials Copy Template editor
This commit changes the Age Protection and Circ as Type fields to links in
the fm_IDL.xml to allow the template to read the data in the fields. It also
changes the owning_lib reporter type to org_unit so the org unit shortname
is displayed in the grid view, along with fixing the config.floating_group cfg
FM settings so that the name is displayed instead of the ID.
[Note from Galen: the forthcoming web staff serials module's serial
copy template editor already provided drop-downs for those two fields,
but the IDL changes remain beneficial.]
Signed-off-by: Michele Morgan <mmorgan at noblenet.org>
Signed-off-by: Josh Stompro <stomproj at larl.org>
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
diff --git a/Open-ILS/examples/fm_IDL.xml b/Open-ILS/examples/fm_IDL.xml
index bc99527..cfcdd10 100644
--- a/Open-ILS/examples/fm_IDL.xml
+++ b/Open-ILS/examples/fm_IDL.xml
@@ -6901,18 +6901,18 @@ SELECT usr,
<class id="act" controller="open-ils.cstore open-ils.pcrud" oils_obj:fieldmapper="asset::copy_template" oils_persist:tablename="asset.copy_template" reporter:label="Asset Copy Template">
<fields oils_persist:primary="id" oils_persist:sequence="asset.copy_template_id_seq">
<field reporter:label="ID" name="id" reporter:datatype="id" reporter:selector="name" />
- <field reporter:label="Owning Lib" name="owning_lib" reporter:datatype="link"/>
+ <field reporter:label="Owning Lib" name="owning_lib" reporter:datatype="org_unit"/>
<field reporter:label="Creator" name="creator" reporter:datatype="link"/>
<field reporter:label="Editor" name="editor" reporter:datatype="link"/>
<field reporter:label="Create Date" name="create_date" reporter:datatype="timestamp"/>
<field reporter:label="Edit Date" name="edit_date" reporter:datatype="timestamp"/>
<field reporter:label="Name" name="name" reporter:datatype="text"/>
- <field reporter:label="Circ Lib" name="circ_lib" reporter:datatype="link"/>
+ <field reporter:label="Circ Lib" name="circ_lib" reporter:datatype="org_unit"/>
<field reporter:label="Status" name="status" reporter:datatype="link"/>
<field reporter:label="Location" name="location" reporter:datatype="link"/>
<field reporter:label="Loan Duration" name="loan_duration" reporter:datatype="int"/>
<field reporter:label="Fine Level" name="fine_level" reporter:datatype="int"/>
- <field reporter:label="Age Protect" name="age_protect" reporter:datatype="int"/>
+ <field reporter:label="Age Protect" name="age_protect" reporter:datatype="link"/>
<field reporter:label="Circulate?" name="circulate" reporter:datatype="bool"/>
<field reporter:label="Deposit?" name="deposit" reporter:datatype="bool"/>
<field reporter:label="Reference?" name="ref" reporter:datatype="bool"/>
@@ -6920,7 +6920,7 @@ SELECT usr,
<field reporter:label="Deposit Amount" name="deposit_amount" reporter:datatype="money"/>
<field reporter:label="Price" name="price" reporter:datatype="money"/>
<field reporter:label="Circ Modifier" name="circ_modifier" reporter:datatype="link"/>
- <field reporter:label="Circ As Type" name="circ_as_type" reporter:datatype="text"/>
+ <field reporter:label="Circ As Type" name="circ_as_type" reporter:datatype="link"/>
<field reporter:label="Alert Message" name="alert_message" reporter:datatype="text"/>
<field reporter:label="OPAC Visible?" name="opac_visible" reporter:datatype="bool"/>
<field reporter:label="Floating Group" name="floating" reporter:datatype="link"/>
@@ -6935,6 +6935,8 @@ SELECT usr,
<link field="circ_modifier" reltype="has_a" key="code" map="" class="ccm"/>
<link field="location" reltype="has_a" key="id" map="" class="acpl"/>
<link field="floating" reltype="has_a" key="id" map="" class="cfg"/>
+ <link field="age_protect" reltype="has_a" key="id" map="" class="crahp"/>
+ <link field="circ_as_type" reltype="has_a" key="code" map="" class="citm"/>
</links>
<permacrud xmlns="http://open-ils.org/spec/opensrf/IDL/permacrud/v1">
<actions>
@@ -11571,7 +11573,7 @@ SELECT usr,
</class>
<class id="cfg" controller="open-ils.cstore open-ils.pcrud" oils_obj:fieldmapper="config::floating_group" oils_persist:tablename="config.floating_group" reporter:label="Floating Group">
<fields oils_persist:primary="id" oils_persist:sequence="config.floating_group_id_seq">
- <field reporter:label="ID" name="id" reporter:datatype="id"/>
+ <field reporter:label="ID" name="id" reporter:selector="name" reporter:datatype="id"/>
<field reporter:label="Name" name="name" reporter:datatype="text"/>
<field reporter:label="Manual" name="manual" reporter:datatype="bool"/>
<field reporter:label="Group Members" name="members" oils_persist:virtual="true" reporter:datatype="link"/>
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/examples/fm_IDL.xml | 12 ++++---
Open-ILS/src/sql/Pg/002.schema.config.sql | 2 +-
...fy_invalid_act.age_protect_act.circ_as_type.sql | 35 ++++++++++++++++++++
.../src/templates/opac/parts/ebook_api/base_js.tt2 | 2 +-
docs/RELEASE_NOTES_NEXT/Administration/misc.adoc | 5 +++
5 files changed, 49 insertions(+), 7 deletions(-)
create mode 100644 Open-ILS/src/sql/Pg/upgrade/1049.data.nullify_invalid_act.age_protect_act.circ_as_type.sql
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list