[open-ils-commits] ***SPAM*** [GIT] Evergreen ILS branch master updated. ada002e0a67402431c59b0a3d0569710d8f83b70
Evergreen Git
git at git.evergreen-ils.org
Mon Sep 23 11:18:09 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 ada002e0a67402431c59b0a3d0569710d8f83b70 (commit)
via 1276203d893bd02a530ac75b8a47bed48d24ae27 (commit)
via b720d32e0e7b7667c7c22dc805e1d9cb23919c76 (commit)
via 2b134c9ecd6bf53fae4a41f4e7079be3b5defb1b (commit)
via f579796ba830f516deefb7fcfb79740abdcce837 (commit)
via a70787e38083db57b3ff80922fb1c56ebbf617f3 (commit)
from 243dca2a38ff9b6358f5dbd240c61dc14d0b5e4c (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 ada002e0a67402431c59b0a3d0569710d8f83b70
Author: Bill Erickson <berick at esilibrary.com>
Date: Mon Sep 23 11:12:34 2013 -0400
Stamping 0833 : self-reg timeout
Signed-off-by: Bill Erickson <berick 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 d967148..993c966 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 ('0832', :eg_version); -- dbwells/senator
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0833', :eg_version); -- berick/csharp
CREATE TABLE config.bib_source (
id SERIAL PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.self-reg-timeout.sql b/Open-ILS/src/sql/Pg/upgrade/0833.data.self-reg-timeout.sql
similarity index 89%
rename from Open-ILS/src/sql/Pg/upgrade/XXXX.data.self-reg-timeout.sql
rename to Open-ILS/src/sql/Pg/upgrade/0833.data.self-reg-timeout.sql
index 30e2fa7..c86a0c8 100644
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.self-reg-timeout.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/0833.data.self-reg-timeout.sql
@@ -1,5 +1,7 @@
BEGIN;
+SELECT evergreen.upgrade_deps_block_check('0833', :eg_version);
+
INSERT INTO config.org_unit_setting_type
(name, grp, datatype, label, description)
VALUES (
commit 1276203d893bd02a530ac75b8a47bed48d24ae27
Author: Bill Erickson <berick at esilibrary.com>
Date: Wed Sep 11 14:19:07 2013 -0400
LP#1218597 pending patron row-date IDL label change
Change "Row Date" to "Create Date" as the row_date label in the IDL.
This is more consistent with other like fields viewed in the staff
client.
Signed-off-by: Bill Erickson <berick at esilibrary.com>
Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
diff --git a/Open-ILS/examples/fm_IDL.xml b/Open-ILS/examples/fm_IDL.xml
index 1a63a12..2cd362d 100644
--- a/Open-ILS/examples/fm_IDL.xml
+++ b/Open-ILS/examples/fm_IDL.xml
@@ -8946,7 +8946,7 @@ SELECT usr,
<class id="stgu" controller="open-ils.cstore" oils_obj:fieldmapper="staging::user_stage" oils_persist:tablename="staging.user_stage" reporter:label="User Stage">
<fields oils_persist:primary="row_id" oils_persist:sequence="staging.user_stage_row_id_seq">
<field reporter:label="Row ID" name="row_id" reporter:datatype="id"/>
- <field reporter:label="Row Date" name="row_date" reporter:datatype="timestamp"/>
+ <field reporter:label="Create Date" name="row_date" reporter:datatype="timestamp"/>
<field reporter:label="User Name" name="usrname" reporter:datatype="text"/>
<field reporter:label="Main (Profile) Permission Group" name="profile" reporter:datatype="text"/>
<field reporter:label="Email Address" name="email" reporter:datatype="text"/>
commit b720d32e0e7b7667c7c22dc805e1d9cb23919c76
Author: Bill Erickson <berick at esilibrary.com>
Date: Fri Sep 6 16:17:08 2013 -0400
LP#1218597 Load pending patron via double-click
Double-click on a row in the pending patrons list in the staff client
loads the pending patron into the patron registration UI in a new tab,
same as clicking the existing Load button.
phasefx++ for implementation suggestions.
Signed-off-by: Bill Erickson <berick at esilibrary.com>
Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
diff --git a/Open-ILS/xul/staff_client/server/patron/staged.js b/Open-ILS/xul/staff_client/server/patron/staged.js
index 8909555..e93263f 100644
--- a/Open-ILS/xul/staff_client/server/patron/staged.js
+++ b/Open-ILS/xul/staff_client/server/patron/staged.js
@@ -222,7 +222,10 @@ function init_list() {
}
),
'retrieve_row' : retrieve_row,
- 'on_select' : handle_selection
+ 'on_select' : handle_selection,
+ 'on_dblclick' : function(ev) {
+ gen_event_handler('load')();
+ }
}
);
commit 2b134c9ecd6bf53fae4a41f4e7079be3b5defb1b
Author: Bill Erickson <berick at esilibrary.com>
Date: Wed Aug 28 15:51:15 2013 -0400
LP#1218597 TPAC honors opac.username_regex setting
If a value for requested username is entered and the org unit setting
"opac.username_regex" has a value, the regex will be enforced just like
the other .regex org unit settings in use in self-reg.
Signed-off-by: Bill Erickson <berick at esilibrary.com>
Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Register.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Register.pm
index cf6a987..0b68f1a 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Register.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Register.pm
@@ -183,6 +183,11 @@ sub collect_register_validation_settings {
$ctx->{get_org_setting}->($ctx_org, 'ui.patron.edit.phone.regex')
unless $shash->{stgu}{day_phone}{regex};
+ # The regex OUS for username does not match the format of the other
+ # org settings. Wrangle it into place.
+ $shash->{stgu}{usrname}{regex} =
+ $ctx->{get_org_setting}->($ctx_org, 'opac.username_regex');
+
# some fields are assumed to be visible / required even without the
# presence of org unit settings. E.g. we obviously want the user to
# enter a name, since a name is required for ultimately creating a user
commit f579796ba830f516deefb7fcfb79740abdcce837
Author: Bill Erickson <berick at esilibrary.com>
Date: Wed Aug 28 13:41:21 2013 -0400
LP#1218597 tpac self-reg refresh page for privacy
Adding a new org unit setting "opac.self_register.timeout" /
"Patron Self-Reg. Display Timeout" for determning how long the self-reg
page will remain open before reloading to the home page. The goal is to
protect the privacy of those who enter values but fail to submit the
form.
Signed-off-by: Bill Erickson <berick at esilibrary.com>
Conflicts:
Open-ILS/src/sql/Pg/950.data.seed-values.sql
Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Register.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Register.pm
index cdbe9a4..cf6a987 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Register.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Register.pm
@@ -206,6 +206,10 @@ sub collect_register_validation_settings {
unless defined $shash->{stgu}{usrname}{show};
$ctx->{register}{settings} = $shash;
+
+ # laod the page timeout setting
+ $shash->{refresh_timeout} =
+ $ctx->{get_org_setting}->($ctx_org, 'opac.self_register.timeout');
}
# inspects each value and determines, based on org unit settings,
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 aa54759..9e913c3 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -13376,8 +13376,6 @@ VALUES (
);
-
-
INSERT into config.org_unit_setting_type
(name, grp, label, description, datatype)
VALUES (
@@ -13410,3 +13408,24 @@ VALUES (
TRUE
);
+INSERT INTO config.org_unit_setting_type
+ (name, grp, datatype, label, description)
+VALUES (
+ 'opac.self_register.timeout',
+ 'opac',
+ 'integer',
+ oils_i18n_gettext(
+ 'opac.self_register.timeout',
+ 'Patron Self-Reg. Display Timeout',
+ 'coust',
+ 'label'
+ ),
+ oils_i18n_gettext(
+ 'opac.self_register.timeout',
+ 'Number of seconds to wait before reloading the patron self-'||
+ 'registration interface to clear sensitive data',
+ 'coust',
+ 'description'
+ )
+);
+
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.self-reg-timeout.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.self-reg-timeout.sql
new file mode 100644
index 0000000..30e2fa7
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.self-reg-timeout.sql
@@ -0,0 +1,24 @@
+BEGIN;
+
+INSERT INTO config.org_unit_setting_type
+ (name, grp, datatype, label, description)
+VALUES (
+ 'opac.self_register.timeout',
+ 'opac',
+ 'integer',
+ oils_i18n_gettext(
+ 'opac.self_register.timeout',
+ 'Patron Self-Reg. Display Timeout',
+ 'coust',
+ 'label'
+ ),
+ oils_i18n_gettext(
+ 'opac.self_register.timeout',
+ 'Number of seconds to wait before reloading the patron self-'||
+ 'registration interface to clear sensitive data',
+ 'coust',
+ 'description'
+ )
+);
+
+COMMIT;
diff --git a/Open-ILS/src/templates/opac/register.tt2 b/Open-ILS/src/templates/opac/register.tt2
index f307b7f..1e80cf6 100644
--- a/Open-ILS/src/templates/opac/register.tt2
+++ b/Open-ILS/src/templates/opac/register.tt2
@@ -4,6 +4,10 @@
INCLUDE "opac/parts/topnav.tt2";
ctx.page_title = l("Request Library Card");
+# for privacy, reload the page after (default) 5 minutes
+refresh_time = ctx.register.settings.refresh_timeout || 300;
+ctx.refresh = refresh_time _ '; ' _ ctx.opac_root _ '/home';
+
# some useful variables and MACROs for display,
# field validation, and added info display
commit a70787e38083db57b3ff80922fb1c56ebbf617f3
Author: Bill Erickson <berick at esilibrary.com>
Date: Wed Aug 28 13:27:52 2013 -0400
LP#1218597 TPAC self-reg DoB date format example message
Provide an example DoB date format message. Since the message may need
translating, it is provided as a template string and not an org unit
setting. Note, however, that the Dojo widget inside the patron
registration UI, where self-reg data ultimately goes, requires
incoming/default date values to be in ISO8601 format. It will not
accept locale-shaped dates.
Signed-off-by: Bill Erickson <berick at esilibrary.com>
Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
diff --git a/Open-ILS/src/templates/opac/register.tt2 b/Open-ILS/src/templates/opac/register.tt2
index a1c7b0e..f307b7f 100644
--- a/Open-ILS/src/templates/opac/register.tt2
+++ b/Open-ILS/src/templates/opac/register.tt2
@@ -34,6 +34,13 @@ register_fields = [
{class => 'stgu', name = 'email', label => l('Email Address')}
{class => 'stgu', name = 'usrname', label => l('Requested Username')}
];
+
+# The dojo date widget in the patron edit UI only accepts default
+# values in ISO8601 format. It will not accept locale-shaped dates.
+IF !ctx.register.settings.stgu.dob.example;
+ ctx.register.settings.stgu.dob.example = l('YYYY-MM-DD');
+END;
+
%]
<div id="content-wrapper">
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/examples/fm_IDL.xml | 2 +-
.../lib/OpenILS/WWW/EGCatLoader/Register.pm | 9 +++++++
Open-ILS/src/sql/Pg/002.schema.config.sql | 2 +-
Open-ILS/src/sql/Pg/950.data.seed-values.sql | 23 ++++++++++++++++-
.../sql/Pg/upgrade/0833.data.self-reg-timeout.sql | 26 ++++++++++++++++++++
Open-ILS/src/templates/opac/register.tt2 | 11 ++++++++
Open-ILS/xul/staff_client/server/patron/staged.js | 5 +++-
7 files changed, 73 insertions(+), 5 deletions(-)
create mode 100644 Open-ILS/src/sql/Pg/upgrade/0833.data.self-reg-timeout.sql
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list