[open-ils-commits] [GIT] Evergreen ILS branch master updated. e1337996b6a6c743997be58f8070d49010845271
Evergreen Git
git at git.evergreen-ils.org
Wed Feb 27 10:47:00 EST 2013
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 e1337996b6a6c743997be58f8070d49010845271 (commit)
via 430c8474fe10a559b6fbd39515c0cb6c5168b7e4 (commit)
via 06afa5d5a80cfa1c2f3a02bcd3ccbc6efca71e36 (commit)
via a9811c7c63db9ca1c9c4303a63865a8bf2483312 (commit)
from 057b9f43316044ad5836825b31a5f3745977ee7b (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 e1337996b6a6c743997be58f8070d49010845271
Author: Mike Rylander <mrylander at gmail.com>
Date: Wed Feb 27 10:46:00 2013 -0500
Stamping upgrade scripts for Vandelay default match set, with minor adjustments
Signed-off-by: Mike Rylander <mrylander at gmail.com>
diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index af1a771..10ad215 100644
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -87,7 +87,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 ('0757', :eg_version); -- tsbere/senator
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0758', :eg_version); -- jeff davis / miker
CREATE TABLE config.bib_source (
id SERIAL PRIMARY KEY,
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 95f0f5c..37e0d32 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -4725,13 +4725,13 @@ INSERT into config.org_unit_setting_type
,( 'vandelay.default_match_set', 'vandelay',
oils_i18n_gettext(
'vandelay.default_match_set',
- 'Vandelay: Default Record Match Set',
+ 'Default Record Match Set',
'coust',
'label'
),
oils_i18n_gettext(
'vandelay.default_match_set',
- 'Vandelay: Default Record Match Set',
+ 'Default Record Match Set',
'coust',
'description'
),
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.vandelay-default-match-set.sql b/Open-ILS/src/sql/Pg/upgrade/0758.data.vandelay-default-match-set.sql
similarity index 53%
rename from Open-ILS/src/sql/Pg/upgrade/XXXX.data.vandelay-default-match-set.sql
rename to Open-ILS/src/sql/Pg/upgrade/0758.data.vandelay-default-match-set.sql
index 32db333..334f90a 100644
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.vandelay-default-match-set.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/0758.data.vandelay-default-match-set.sql
@@ -1,11 +1,11 @@
BEGIN;
-SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
+SELECT evergreen.upgrade_deps_block_check('0758', :eg_version);
INSERT INTO config.settings_group (name, label) VALUES
('vandelay', 'Vandelay');
INSERT INTO config.org_unit_setting_type (name, grp, label, datatype, fm_class) VALUES
- ('vandelay.default_match_set', 'vandelay', 'Vandelay: Default Record Match Set', 'link', 'vms');
+ ('vandelay.default_match_set', 'vandelay', 'Default Record Match Set', 'link', 'vms');
COMMIT;
commit 430c8474fe10a559b6fbd39515c0cb6c5168b7e4
Author: Ben Shum <bshum at biblio.org>
Date: Thu Jan 31 18:15:28 2013 -0500
Add default Vandelay match set to schema
Only had the upgrade SQL, need to actually make the change to the stock schema too.
Signed-off-by: Ben Shum <bshum at biblio.org>
Signed-off-by: Mike Rylander <mrylander at gmail.com>
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 4381559..95f0f5c 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -2512,7 +2512,8 @@ INSERT INTO config.settings_group (name, label) VALUES
('booking', oils_i18n_gettext('config.settings_group.booking', 'Booking', 'coust', 'label')),
('offline', oils_i18n_gettext('config.settings_group.offline', 'Offline', 'coust', 'label')),
('receipt_template', oils_i18n_gettext('config.settings_group.receipt_template', 'Receipt Template', 'coust', 'label')),
-('sms', oils_i18n_gettext('sms','SMS Text Messages','csg','label'))
+('sms', oils_i18n_gettext('sms','SMS Text Messages','csg','label')),
+('vandelay', oils_i18n_gettext('vandelay','Vandelay','coust','label'))
;
@@ -4721,6 +4722,20 @@ INSERT into config.org_unit_setting_type
'description'
),
'string', null)
+,( 'vandelay.default_match_set', 'vandelay',
+ oils_i18n_gettext(
+ 'vandelay.default_match_set',
+ 'Vandelay: Default Record Match Set',
+ 'coust',
+ 'label'
+ ),
+ oils_i18n_gettext(
+ 'vandelay.default_match_set',
+ 'Vandelay: Default Record Match Set',
+ 'coust',
+ 'description'
+ ),
+ 'string', null)
;
commit 06afa5d5a80cfa1c2f3a02bcd3ccbc6efca71e36
Author: Kathy Lussier <klussier at masslnc.org>
Date: Thu Jan 31 12:50:47 2013 -0500
Release notes entry for default Vandelay match set
Adding a release notes entry for default Vandelay match set.
Signed-off-by: Kathy Lussier <klussier at masslnc.org>
Signed-off-by: Ben Shum <bshum at biblio.org>
Signed-off-by: Mike Rylander <mrylander at gmail.com>
diff --git a/docs/RELEASE_NOTES_NEXT/vandelay_default_match_set.txt b/docs/RELEASE_NOTES_NEXT/vandelay_default_match_set.txt
new file mode 100644
index 0000000..836b2e5
--- /dev/null
+++ b/docs/RELEASE_NOTES_NEXT/vandelay_default_match_set.txt
@@ -0,0 +1,11 @@
+Vandelay Default Match Set
+==========================
+A new org unit setting to specify a default Record Match Set when
+importing MARC records through the MARC Batch Import/Export interface. It does
+not affect the default match set selected in acquisitions. If this
+is set, it will not be possible to leave the Record Match Set field blank;
+it may be necessary to define a default match set that replicates the current
+default behavior.
+
+A new "Vandelay" org unit settings group is also created.
+
commit a9811c7c63db9ca1c9c4303a63865a8bf2483312
Author: Jeff Davis <jdavis at sitka.bclibraries.ca>
Date: Wed Oct 17 16:19:36 2012 -0700
Vandelay: default match set
Adds an org unit setting to specify a default Record Match Set when
importing MARC records with Vandelay. NB: If this is set, it will not
be possible to leave the Record Match Set field blank; it may be
necessary to define a default match set that replicates the current
default behavior.
A new "Vandelay" settings group is also created.
Signed-off-by: Jeff Davis <jdavis at sitka.bclibraries.ca>
Signed-off-by: Ben Shum <bshum at biblio.org>
Signed-off-by: Kathy Lussier <klussier at masslnc.org>
Signed-off-by: Mike Rylander <mrylander at gmail.com>
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.vandelay-default-match-set.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.vandelay-default-match-set.sql
new file mode 100644
index 0000000..32db333
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.vandelay-default-match-set.sql
@@ -0,0 +1,11 @@
+BEGIN;
+
+SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
+
+INSERT INTO config.settings_group (name, label) VALUES
+ ('vandelay', 'Vandelay');
+
+INSERT INTO config.org_unit_setting_type (name, grp, label, datatype, fm_class) VALUES
+ ('vandelay.default_match_set', 'vandelay', 'Vandelay: Default Record Match Set', 'link', 'vms');
+
+COMMIT;
diff --git a/Open-ILS/web/js/ui/default/vandelay/vandelay.js b/Open-ILS/web/js/ui/default/vandelay/vandelay.js
index 7df3068..26ca3cc 100644
--- a/Open-ILS/web/js/ui/default/vandelay/vandelay.js
+++ b/Open-ILS/web/js/ui/default/vandelay/vandelay.js
@@ -93,6 +93,10 @@ var copyStatusCache = {};
var copyLocationCache = {};
var localeStrings;
+// org settings
+var orgSettings = {};
+const DEFAULT_MATCH_SET = 'vandelay.default_match_set';
+
/**
* Grab initial data
*/
@@ -212,6 +216,13 @@ function vlInit() {
}
);
+ orgSettings = fieldmapper.aou.fetchOrgSettingBatch(openils.User.user.ws_ou(), [
+ DEFAULT_MATCH_SET
+ ]);
+ for(k in orgSettings)
+ if(orgSettings[k])
+ orgSettings[k] = orgSettings[k].value;
+
vlAttrEditorInit();
vlExportInit();
}
@@ -1435,6 +1446,13 @@ function vlUpdateMatchSetSelector(type) {
type = (type.match(/bib/)) ? 'biblio' : 'authority';
vlUploadQueueMatchSet.store =
new dojo.data.ItemFileReadStore({data:vms.toStoreData(matchSets[type])});
+ // apply default match set
+ for (var i = 0; i < matchSets[type].length; i++) {
+ if (matchSets[type][i].id() == orgSettings[DEFAULT_MATCH_SET]) {
+ vlUploadQueueMatchSet.setValue(matchSets[type][i].id());
+ break;
+ }
+ }
}
function vlShowUploadForm() {
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/src/sql/Pg/002.schema.config.sql | 2 +-
Open-ILS/src/sql/Pg/950.data.seed-values.sql | 17 ++++++++++++++++-
.../0758.data.vandelay-default-match-set.sql | 11 +++++++++++
Open-ILS/web/js/ui/default/vandelay/vandelay.js | 18 ++++++++++++++++++
.../vandelay_default_match_set.txt | 11 +++++++++++
5 files changed, 57 insertions(+), 2 deletions(-)
create mode 100644 Open-ILS/src/sql/Pg/upgrade/0758.data.vandelay-default-match-set.sql
create mode 100644 docs/RELEASE_NOTES_NEXT/vandelay_default_match_set.txt
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list