[open-ils-commits] [GIT] Evergreen ILS branch master updated. b6d0ee7f0eeed0c65270a13aba0627f2e7c83cdd
Evergreen Git
git at git.evergreen-ils.org
Fri Jul 12 11:58:28 EDT 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 b6d0ee7f0eeed0c65270a13aba0627f2e7c83cdd (commit)
via 959bcf1f3ff5d33a610686a363337cb75b3a1365 (commit)
via 6d77e5d64b180f5f78627547418757ecb2d7e4e5 (commit)
from 81ce189f4623e62109bdc5bbcbcc9ba8c48e4dd5 (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 b6d0ee7f0eeed0c65270a13aba0627f2e7c83cdd
Author: Jason Etheridge <jason at esilibrary.com>
Date: Fri Jul 12 12:21:47 2013 -0400
upgrde scrpt/release note for Usr Setting Defaults
Signed-off-by: Jason Etheridge <jason at esilibrary.com>
diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index 2d44af9..8eae7a7 100644
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -91,7 +91,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 ('0806', :eg_version); -- berick/miker
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0807', :eg_version); -- tsbere/phasefx
CREATE TABLE config.bib_source (
id SERIAL PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/0807.usr_setting_default.sql b/Open-ILS/src/sql/Pg/upgrade/0807.usr_setting_default.sql
new file mode 100644
index 0000000..c67fd0e
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/0807.usr_setting_default.sql
@@ -0,0 +1,9 @@
+BEGIN;
+
+-- check whether patch can be applied
+SELECT evergreen.upgrade_deps_block_check('0807', :eg_version);
+
+ALTER TABLE config.usr_setting_type
+ ADD COLUMN reg_default TEXT;
+
+COMMIT;
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.usr_setting_default.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.usr_setting_default.sql
deleted file mode 100644
index e55e1e2..0000000
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.usr_setting_default.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-ALTER TABLE config.usr_setting_type
- ADD COLUMN reg_default TEXT;
diff --git a/docs/RELEASE_NOTES_NEXT/Client/user-setting-defaults.txt b/docs/RELEASE_NOTES_NEXT/Client/user-setting-defaults.txt
new file mode 100644
index 0000000..333018c
--- /dev/null
+++ b/docs/RELEASE_NOTES_NEXT/Client/user-setting-defaults.txt
@@ -0,0 +1,4 @@
+User Setting Defaults
+^^^^^^^^^^^^^^^^^^^^^^^^
+
+For use during Patron Registration, we can now have supply default values for User Settings, under Admin -> Server Administration -> User Setting Types.
commit 959bcf1f3ff5d33a610686a363337cb75b3a1365
Author: Jason Etheridge <jason at esilibrary.com>
Date: Fri Jul 12 12:16:10 2013 -0400
match surrounding whitespace
Signed-off-by: Jason Etheridge <jason at esilibrary.com>
diff --git a/Open-ILS/examples/fm_IDL.xml b/Open-ILS/examples/fm_IDL.xml
index 6ea71d4..882fe12 100644
--- a/Open-ILS/examples/fm_IDL.xml
+++ b/Open-ILS/examples/fm_IDL.xml
@@ -3110,7 +3110,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
<field name="fm_class" reporter:label="Fielmapper Class" reporter:datatype="text"/>
<field name="grp" reporter:label="Settings Group" reporter:datatype="link"/>
<field name="opac_visible" reporter:label="OPAC/Patron Visible" reporter:datatype="bool"/>
- <field name="reg_default" reporter:label="Registration Default" reporter:datatype="text"/>
+ <field name="reg_default" reporter:label="Registration Default" reporter:datatype="text"/>
</fields>
<links>
<link field="name" reltype="has_many" key="name" map="" class="aus"/>
commit 6d77e5d64b180f5f78627547418757ecb2d7e4e5
Author: Thomas Berezansky <tsbere at mvlc.org>
Date: Tue Oct 2 16:47:42 2012 -0400
User Setting Registration Defaults
Add a new reg_default value for user setting types. On patron registration
the value (if any) is used as a default for the patron.
Only applicable to those settings editable via the patron editor.
Intended use cases:
1 - Hold Notification Type Default other than phone:email
2 - A/T user settings defaulting to "on" at registration
Signed-off-by: Thomas Berezansky <tsbere at mvlc.org>
Signed-off-by: Jason Etheridge <jason at esilibrary.com>
diff --git a/Open-ILS/examples/fm_IDL.xml b/Open-ILS/examples/fm_IDL.xml
index cbdd13b..6ea71d4 100644
--- a/Open-ILS/examples/fm_IDL.xml
+++ b/Open-ILS/examples/fm_IDL.xml
@@ -3110,6 +3110,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
<field name="fm_class" reporter:label="Fielmapper Class" reporter:datatype="text"/>
<field name="grp" reporter:label="Settings Group" reporter:datatype="link"/>
<field name="opac_visible" reporter:label="OPAC/Patron Visible" reporter:datatype="bool"/>
+ <field name="reg_default" reporter:label="Registration Default" reporter:datatype="text"/>
</fields>
<links>
<link field="name" reltype="has_many" key="name" map="" class="aus"/>
diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index 35c130b..2d44af9 100644
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -614,6 +614,7 @@ CREATE TABLE config.usr_setting_type (
grp TEXT REFERENCES config.settings_group (name),
datatype TEXT NOT NULL DEFAULT 'string',
fm_class TEXT,
+ reg_default TEXT,
--
-- define valid datatypes
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.usr_setting_default.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.usr_setting_default.sql
new file mode 100644
index 0000000..e55e1e2
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.usr_setting_default.sql
@@ -0,0 +1,2 @@
+ALTER TABLE config.usr_setting_type
+ ADD COLUMN reg_default TEXT;
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 58c2c70..e70d867 100644
--- a/Open-ILS/web/js/ui/default/actor/user/register.js
+++ b/Open-ILS/web/js/ui/default/actor/user/register.js
@@ -672,6 +672,14 @@ function uEditFetchUserSettings(userId) {
userSettings = fieldmapper.standardRequest(
['open-ils.actor', 'open-ils.actor.patron.settings.retrieve.authoritative'],
{params : [openils.User.authtoken, userId, names]});
+ } else {
+ // Defaults!
+ userSettingTypes.forEach(function(setting, index, array) {
+ if(setting.reg_default() != undefined) {
+ userSettings[setting.name()] = setting.reg_default();
+ userSettingsToUpdate[setting.name()] = setting.reg_default();
+ }
+ });
}
}
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/examples/fm_IDL.xml | 1 +
Open-ILS/src/sql/Pg/002.schema.config.sql | 3 ++-
.../sql/Pg/upgrade/0807.usr_setting_default.sql | 9 +++++++++
Open-ILS/web/js/ui/default/actor/user/register.js | 8 ++++++++
.../Client/user-setting-defaults.txt | 4 ++++
5 files changed, 24 insertions(+), 1 deletions(-)
create mode 100644 Open-ILS/src/sql/Pg/upgrade/0807.usr_setting_default.sql
create mode 100644 docs/RELEASE_NOTES_NEXT/Client/user-setting-defaults.txt
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list