[open-ils-commits] [GIT] Evergreen ILS branch master updated. 0b8ca5bc8fc514d4897d3c9f596d9e135ab428a8
Evergreen Git
git at git.evergreen-ils.org
Tue Aug 9 14:16:24 EDT 2011
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 0b8ca5bc8fc514d4897d3c9f596d9e135ab428a8 (commit)
via 5449a194bfdfbe132911b9e0a8e809804d60c39d (commit)
from f303d7f058b28e69434372c8ee85fe334ca4144c (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 0b8ca5bc8fc514d4897d3c9f596d9e135ab428a8
Author: Thomas Berezansky <tsbere at mvlc.org>
Date: Tue Aug 9 14:14:18 2011 -0400
Stamping upgrade scripts for LP#818740
Signed-off-by: Thomas Berezansky <tsbere at mvlc.org>
diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index a8c2e9f..b386c5b 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 ('0594', :eg_version); -- phasefx/miker
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0595', :eg_version); -- phasefx/tsbere
CREATE TABLE config.bib_source (
id SERIAL PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.org-setting-ui.patron_search.result_cap.sql b/Open-ILS/src/sql/Pg/upgrade/0595.data.org-setting-ui.patron_search.result_cap.sql
similarity index 85%
rename from Open-ILS/src/sql/Pg/upgrade/XXXX.data.org-setting-ui.patron_search.result_cap.sql
rename to Open-ILS/src/sql/Pg/upgrade/0595.data.org-setting-ui.patron_search.result_cap.sql
index aacc6c9..0751d45 100644
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.org-setting-ui.patron_search.result_cap.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/0595.data.org-setting-ui.patron_search.result_cap.sql
@@ -1,11 +1,11 @@
--- Evergreen DB patch XXXX.data.org-setting-ui.patron_search.result_cap.sql
+-- Evergreen DB patch 0595.data.org-setting-ui.patron_search.result_cap.sql
--
-- New org setting ui.patron_search.result_cap
--
BEGIN;
-- check whether patch can be applied
-SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
+SELECT evergreen.upgrade_deps_block_check('0595', :eg_version);
INSERT INTO config.org_unit_setting_type ( name, label, description, datatype )
VALUES (
commit 5449a194bfdfbe132911b9e0a8e809804d60c39d
Author: Jason Etheridge <jason at esilibrary.com>
Date: Sun Jul 31 01:39:39 2011 -0400
Org setting for the result cap for Patron Search
Signed-off-by: Jason Etheridge <jason at esilibrary.com>
Signed-off-by: Thomas Berezansky <tsbere at mvlc.org>
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 29a4f90..01416a0 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -2840,6 +2840,24 @@ INSERT into config.org_unit_setting_type
),
'bool'
)
+,(
+ 'ui.patron_search.result_cap',
+ oils_i18n_gettext(
+ 'ui.patron_search.result_cap',
+ 'GUI: Cap results in Patron Search at this number.',
+ 'coust',
+ 'label'
+ ),
+ oils_i18n_gettext(
+ 'ui.patron_search.result_cap',
+ 'So for example, if you search for John Doe, normally you would get'
+ || ' at most 50 results. This setting allows you to raise or lower'
+ || ' that limit.',
+ 'coust',
+ 'description'
+ ),
+ 'integer'
+ )
;
UPDATE config.org_unit_setting_type
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.org-setting-ui.patron_search.result_cap.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.org-setting-ui.patron_search.result_cap.sql
new file mode 100644
index 0000000..aacc6c9
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.org-setting-ui.patron_search.result_cap.sql
@@ -0,0 +1,30 @@
+-- Evergreen DB patch XXXX.data.org-setting-ui.patron_search.result_cap.sql
+--
+-- New org setting ui.patron_search.result_cap
+--
+BEGIN;
+
+-- check whether patch can be applied
+SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
+
+INSERT INTO config.org_unit_setting_type ( name, label, description, datatype )
+ VALUES (
+ 'ui.patron_search.result_cap',
+ oils_i18n_gettext(
+ 'ui.patron_search.result_cap',
+ 'GUI: Cap results in Patron Search at this number.',
+ 'coust',
+ 'label'
+ ),
+ oils_i18n_gettext(
+ 'ui.patron_search.result_cap',
+ 'So for example, if you search for John Doe, normally you would get'
+ || ' at most 50 results. This setting allows you to raise or lower'
+ || ' that limit.',
+ 'coust',
+ 'description'
+ ),
+ 'integer'
+ );
+
+COMMIT;
diff --git a/Open-ILS/xul/staff_client/server/patron/search_result.js b/Open-ILS/xul/staff_client/server/patron/search_result.js
index 5449753..6d71bd5 100644
--- a/Open-ILS/xul/staff_client/server/patron/search_result.js
+++ b/Open-ILS/xul/staff_client/server/patron/search_result.js
@@ -26,6 +26,13 @@ patron.search_result.prototype = {
obj.OpenILS.data = new OpenILS.data(); obj.OpenILS.data.init({'via':'stash'});
var obscure_dob = String( obj.OpenILS.data.hash.aous['circ.obscure_dob'] ) == 'true';
+ var result_cap_setting = obj.OpenILS.data.hash.aous[
+ 'ui.patron_search.result_cap'
+ ];
+ if (typeof result_cap_setting != 'undefined') {
+ obj.result_cap = Math.abs( result_cap_setting );
+ }
+
JSAN.use('util.list'); obj.list = new util.list('patron_list');
JSAN.use('patron.util');
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/src/sql/Pg/002.schema.config.sql | 2 +-
Open-ILS/src/sql/Pg/950.data.seed-values.sql | 18 ++++++++++++
...ata.org-setting-ui.patron_search.result_cap.sql | 30 ++++++++++++++++++++
.../staff_client/server/patron/search_result.js | 7 ++++
4 files changed, 56 insertions(+), 1 deletions(-)
create mode 100644 Open-ILS/src/sql/Pg/upgrade/0595.data.org-setting-ui.patron_search.result_cap.sql
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list