[open-ils-commits] [GIT] Evergreen ILS branch master updated. 6d6e118eeaed3c569932c7767c86478d89bac3fe
Evergreen Git
git at git.evergreen-ils.org
Mon Mar 26 13:47:14 EDT 2012
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 6d6e118eeaed3c569932c7767c86478d89bac3fe (commit)
via 7932340a51476cda9c501d4c35b61dc747810d92 (commit)
via 94dfd1b6f53bbcc41a32525dc8aca596a84e0e47 (commit)
from d523b0fd103949e6f8ab2296e3657753cf4fec80 (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 6d6e118eeaed3c569932c7767c86478d89bac3fe
Author: Mike Rylander <mrylander at gmail.com>
Date: Mon Mar 26 13:53:19 2012 -0400
Add patron prefix upgrade to the version upgrade script
Signed-off-by: Mike Rylander <mrylander at gmail.com>
diff --git a/Open-ILS/src/sql/Pg/version-upgrade/2.1-2.2-upgrade-db.sql b/Open-ILS/src/sql/Pg/version-upgrade/2.1-2.2-upgrade-db.sql
index 8c79061..617b206 100644
--- a/Open-ILS/src/sql/Pg/version-upgrade/2.1-2.2-upgrade-db.sql
+++ b/Open-ILS/src/sql/Pg/version-upgrade/2.1-2.2-upgrade-db.sql
@@ -15041,4 +15041,37 @@ SELECT metabib.reingest_metabib_field_entries(source)
;
+SELECT evergreen.upgrade_deps_block_check('0694', :eg_version);
+
+INSERT into config.org_unit_setting_type
+( name, grp, label, description, datatype, fm_class ) VALUES
+
+( 'ui.patron.edit.au.prefix.require', 'gui',
+ oils_i18n_gettext('ui.patron.edit.au.prefix.require',
+ 'Require prefix field on patron registration',
+ 'coust', 'label'),
+ oils_i18n_gettext('ui.patron.edit.au.prefix.require',
+ 'The prefix field will be required on the patron registration screen.'
+ 'coust', 'description'),
+ 'bool', null)
+
+,( 'ui.patron.edit.au.prefix.show', 'gui',
+ oils_i18n_gettext('ui.patron.edit.au.prefix.show',
+ 'Show prefix field on patron registration',
+ 'coust', 'label'),
+ oils_i18n_gettext('ui.patron.edit.au.prefix.show',
+ 'The prefix field will be shown on the patron registration screen. Showing a field makes it appear with required fields even when not required. If the field is required this setting is ignored.'
+ 'coust', 'description'),
+ 'bool', null)
+
+,( 'ui.patron.edit.au.prefix.suggest', 'gui',
+ oils_i18n_gettext('ui.patron.edit.au.prefix.suggest',
+ 'Suggest prefix field on patron registration',
+ 'coust', 'label'),
+ oils_i18n_gettext('ui.patron.edit.au.prefix.suggest',
+ 'The prefix field will be suggested on the patron registration screen. Suggesting a field makes it appear when suggested fields are shown. If the field is shown or required this setting is ignored.'
+ 'coust', 'description'),
+ 'bool', null)
+;
+
COMMIT;
commit 7932340a51476cda9c501d4c35b61dc747810d92
Author: Mike Rylander <mrylander at gmail.com>
Date: Mon Mar 26 13:52:25 2012 -0400
Stamping patron prefix upgrade script
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 cc06eee..acac661 100644
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -86,7 +86,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 ('0693', :eg_version); -- denials/miker
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0694', :eg_version); -- mrpeters/miker
CREATE TABLE config.bib_source (
id SERIAL PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/yyyy.schema.patron_reg_prefix.sql b/Open-ILS/src/sql/Pg/upgrade/0694.schema.patron_reg_prefix.sql
similarity index 95%
rename from Open-ILS/src/sql/Pg/upgrade/yyyy.schema.patron_reg_prefix.sql
rename to Open-ILS/src/sql/Pg/upgrade/0694.schema.patron_reg_prefix.sql
index 2907c34..4fd3e69 100644
--- a/Open-ILS/src/sql/Pg/upgrade/yyyy.schema.patron_reg_prefix.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/0694.schema.patron_reg_prefix.sql
@@ -1,6 +1,6 @@
BEGIN;
-SELECT evergreen.upgrade_deps_block_check('yyyy', :eg_version);
+SELECT evergreen.upgrade_deps_block_check('0694', :eg_version);
INSERT into config.org_unit_setting_type
( name, grp, label, description, datatype, fm_class ) VALUES
commit 94dfd1b6f53bbcc41a32525dc8aca596a84e0e47
Author: Michael Peters <mrpeters at library.in.gov>
Date: Mon Jan 30 11:55:23 2012 -0500
Add a prefix field to patron registration interface
Signed-off-by: Michael Peters <mrpeters at library.in.gov>
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 e17f0ee..88e7d55 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -4412,6 +4412,33 @@ INSERT into config.org_unit_setting_type
'coust', 'description'),
'bool', null)
+,( 'ui.patron.edit.au.prefix.require', 'gui',
+ oils_i18n_gettext('ui.patron.edit.au.prefix.require',
+ 'Require prefix field on patron registration',
+ 'coust', 'label'),
+ oils_i18n_gettext('ui.patron.edit.au.prefix.require',
+ 'The prefix field will be required on the patron registration screen.'
+ 'coust', 'description'),
+ 'bool', null)
+
+,( 'ui.patron.edit.au.prefix.show', 'gui',
+ oils_i18n_gettext('ui.patron.edit.au.prefix.show',
+ 'Show prefix field on patron registration',
+ 'coust', 'label'),
+ oils_i18n_gettext('ui.patron.edit.au.prefix.show',
+ 'The prefix field will be shown on the patron registration screen. Showing a field makes it appear with required fields even when not required. If the field is required this setting is ignored.'
+ 'coust', 'description'),
+ 'bool', null)
+
+,( 'ui.patron.edit.au.prefix.suggest', 'gui',
+ oils_i18n_gettext('ui.patron.edit.au.prefix.suggest',
+ 'Suggest prefix field on patron registration',
+ 'coust', 'label'),
+ oils_i18n_gettext('ui.patron.edit.au.prefix.suggest',
+ 'The prefix field will be shown on the patron registration screen. Showing a field makes it appear with required fields even when not required. If the field is required this setting is ignored.'
+ 'coust', 'description'),
+ 'bool', null)
+
,( 'ui.patron.edit.au.second_given_name.show', 'gui',
oils_i18n_gettext('ui.patron.edit.au.second_given_name.show',
'Show second_given_name field on patron registration',
diff --git a/Open-ILS/src/sql/Pg/upgrade/yyyy.schema.patron_reg_prefix.sql b/Open-ILS/src/sql/Pg/upgrade/yyyy.schema.patron_reg_prefix.sql
new file mode 100644
index 0000000..2907c34
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/yyyy.schema.patron_reg_prefix.sql
@@ -0,0 +1,36 @@
+BEGIN;
+
+SELECT evergreen.upgrade_deps_block_check('yyyy', :eg_version);
+
+INSERT into config.org_unit_setting_type
+( name, grp, label, description, datatype, fm_class ) VALUES
+
+( 'ui.patron.edit.au.prefix.require', 'gui',
+ oils_i18n_gettext('ui.patron.edit.au.prefix.require',
+ 'Require prefix field on patron registration',
+ 'coust', 'label'),
+ oils_i18n_gettext('ui.patron.edit.au.prefix.require',
+ 'The prefix field will be required on the patron registration screen.'
+ 'coust', 'description'),
+ 'bool', null)
+
+,( 'ui.patron.edit.au.prefix.show', 'gui',
+ oils_i18n_gettext('ui.patron.edit.au.prefix.show',
+ 'Show prefix field on patron registration',
+ 'coust', 'label'),
+ oils_i18n_gettext('ui.patron.edit.au.prefix.show',
+ 'The prefix field will be shown on the patron registration screen. Showing a field makes it appear with required fields even when not required. If the field is required this setting is ignored.'
+ 'coust', 'description'),
+ 'bool', null)
+
+,( 'ui.patron.edit.au.prefix.suggest', 'gui',
+ oils_i18n_gettext('ui.patron.edit.au.prefix.suggest',
+ 'Suggest prefix field on patron registration',
+ 'coust', 'label'),
+ oils_i18n_gettext('ui.patron.edit.au.prefix.suggest',
+ 'The prefix field will be suggested on the patron registration screen. Suggesting a field makes it appear when suggested fields are shown. If the field is shown or required this setting is ignored.'
+ 'coust', 'description'),
+ 'bool', null)
+;
+
+COMMIT;
diff --git a/Open-ILS/src/templates/actor/user/register_table.tt2 b/Open-ILS/src/templates/actor/user/register_table.tt2
index 1a41295..775a19a 100644
--- a/Open-ILS/src/templates/actor/user/register_table.tt2
+++ b/Open-ILS/src/templates/actor/user/register_table.tt2
@@ -26,6 +26,7 @@
<tr fmclass='au' fmfield='passwd2' required='required'><td/><td id='verifyPassword'></td><td/></tr>
<tr fmclass='au' fmfield='first_given_name' required='required'/>
<tr fmclass='au' fmfield='second_given_name'/>
+ <tr fmclass='au' fmfield='prefix'/>
<tr fmclass='au' fmfield='family_name' required='required'/>
<tr fmclass='au' fmfield='suffix'/>
<tr fmclass='au' fmfield='alias'/>
diff --git a/Open-ILS/web/js/ui/default/actor/user/register.js b/Open-ILS/web/js/ui/default/actor/user/register.js
index 0f23877..d56622c 100644
--- a/Open-ILS/web/js/ui/default/actor/user/register.js
+++ b/Open-ILS/web/js/ui/default/actor/user/register.js
@@ -127,6 +127,9 @@ function load() {
'ui.patron.registration.require_address',
'circ.holds.behind_desk_pickup_supported',
'circ.patron_edit.clone.copy_address',
+ 'ui.patron.edit.au.prefix.require',
+ 'ui.patron.edit.au.prefix.show',
+ 'ui.patron.edit.au.prefix.suggest',
'ui.patron.edit.au.second_given_name.show',
'ui.patron.edit.au.second_given_name.suggest',
'ui.patron.edit.au.suffix.show',
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/src/sql/Pg/002.schema.config.sql | 2 +-
Open-ILS/src/sql/Pg/950.data.seed-values.sql | 27 +++++++++++++++
.../Pg/upgrade/0694.schema.patron_reg_prefix.sql | 36 ++++++++++++++++++++
.../sql/Pg/version-upgrade/2.1-2.2-upgrade-db.sql | 33 ++++++++++++++++++
.../src/templates/actor/user/register_table.tt2 | 1 +
Open-ILS/web/js/ui/default/actor/user/register.js | 3 ++
6 files changed, 101 insertions(+), 1 deletions(-)
create mode 100644 Open-ILS/src/sql/Pg/upgrade/0694.schema.patron_reg_prefix.sql
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list