[open-ils-commits] [GIT] Evergreen ILS branch master updated. 6bf2e8f997c28fb4c26a0565ff8ce1cb7cc36341
Evergreen Git
git at git.evergreen-ils.org
Wed Jul 10 12:46:17 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 6bf2e8f997c28fb4c26a0565ff8ce1cb7cc36341 (commit)
via 931dcde1977afa8aa442cdb8c3e18eba937d25b7 (commit)
from 6693be3c9cdd8353556a045d61826ed6608fe91a (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 6bf2e8f997c28fb4c26a0565ff8ce1cb7cc36341
Author: Mike Rylander <mrylander at gmail.com>
Date: Wed Jul 10 12:44:33 2013 -0400
Stamping upgrade script for Desk Renewal Circ Lib
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 b779429..37a0633 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 ('0804', :eg_version); -- paxed/remingtron/bshum/dbwells
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0805', :eg_version); -- bshum/miker
CREATE TABLE config.bib_source (
id SERIAL PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.desk_renewal_reuse_circ_lib.sql b/Open-ILS/src/sql/Pg/upgrade/0805.schema.desk_renewal_reuse_circ_lib.sql
similarity index 86%
rename from Open-ILS/src/sql/Pg/upgrade/XXXX.schema.desk_renewal_reuse_circ_lib.sql
rename to Open-ILS/src/sql/Pg/upgrade/0805.schema.desk_renewal_reuse_circ_lib.sql
index 3286436..4d01923 100644
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.desk_renewal_reuse_circ_lib.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/0805.schema.desk_renewal_reuse_circ_lib.sql
@@ -1,7 +1,7 @@
BEGIN;
-- check whether patch can be applied
-SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
+SELECT evergreen.upgrade_deps_block_check('0805', :eg_version);
INSERT INTO config.global_flag (name, label, enabled)
VALUES (
commit 931dcde1977afa8aa442cdb8c3e18eba937d25b7
Author: Ben Shum <bshum at biblio.org>
Date: Mon Feb 11 12:16:10 2013 -0500
Desk Renewal at original circ library
In the same spirit as OPAC Renewal at the original circ library, include a
new setting to allow the same for Desk Renewals.
See 8823e4060bbc825c859327b018c5f8cb29b9ac2a and related.
Signed-off-by: Ben Shum <bshum at biblio.org>
Signed-off-by: Mike Rylander <mrylander at gmail.com>
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm
index d44727b..ff50ed3 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm
@@ -15,6 +15,7 @@ my $script_libs;
my $legacy_script_support = 0;
my $booking_status;
my $opac_renewal_use_circ_lib;
+my $desk_renewal_use_circ_lib;
sub determine_booking_status {
unless (defined $booking_status) {
@@ -3664,6 +3665,20 @@ sub do_renew {
$self->circ_lib($circ->circ_lib) if($opac_renewal_use_circ_lib);
}
+ # Desk renewal - re-use circ library from original circ (unless told not to)
+ if($self->desk_renewal) {
+ unless(defined($desk_renewal_use_circ_lib)) {
+ my $use_circ_lib = $self->editor->retrieve_config_global_flag('circ.desk_renewal.use_original_circ_lib');
+ if($use_circ_lib and $U->is_true($use_circ_lib->enabled)) {
+ $desk_renewal_use_circ_lib = 1;
+ }
+ else {
+ $desk_renewal_use_circ_lib = 0;
+ }
+ }
+ $self->circ_lib($circ->circ_lib) if($desk_renewal_use_circ_lib);
+ }
+
# Run the fine generator against the old circ
$self->generate_fines_start;
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 08f8766..33d7371 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -9108,6 +9108,18 @@ INSERT INTO config.global_flag (name, label, enabled)
FALSE
);
+INSERT INTO config.global_flag (name, label, enabled)
+ VALUES (
+ 'circ.desk_renewal.use_original_circ_lib',
+ oils_i18n_gettext(
+ 'circ.desk_renewal.use_original_circ_lib',
+ 'Circ: Use original circulation library on desk renewal instead of user home library',
+ 'cgf',
+ 'label'
+ ),
+ FALSE
+ );
+
INSERT INTO config.global_flag (name, label, value, enabled)
VALUES (
'opac.use_autosuggest',
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.desk_renewal_reuse_circ_lib.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.desk_renewal_reuse_circ_lib.sql
new file mode 100644
index 0000000..3286436
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.desk_renewal_reuse_circ_lib.sql
@@ -0,0 +1,18 @@
+BEGIN;
+
+-- check whether patch can be applied
+SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
+
+INSERT INTO config.global_flag (name, label, enabled)
+ VALUES (
+ 'circ.desk_renewal.use_original_circ_lib',
+ oils_i18n_gettext(
+ 'circ.desk_renewal.use_original_circ_lib',
+ 'Circ: Use original circulation library on desk renewal instead of user home library',
+ 'cgf',
+ 'label'
+ ),
+ FALSE
+ );
+
+COMMIT;
diff --git a/docs/RELEASE_NOTES_NEXT/Circulation/desk-renewal-at-original-circ-lib.txt b/docs/RELEASE_NOTES_NEXT/Circulation/desk-renewal-at-original-circ-lib.txt
new file mode 100644
index 0000000..5b665a3
--- /dev/null
+++ b/docs/RELEASE_NOTES_NEXT/Circulation/desk-renewal-at-original-circ-lib.txt
@@ -0,0 +1,8 @@
+Setting for Desk Renewal to use original circulating library
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+A new global flag option has been added to allow the circulating library of
+a desk renewal (aka a renewal using the staff client) to reuse the original
+circulation library for circ rule behaviors rather than using the workstation.
+This new setting is similar to existing options to use the originating
+circulation library in OPAC renewals.
-----------------------------------------------------------------------
Summary of changes:
.../lib/OpenILS/Application/Circ/Circulate.pm | 15 +++++++++++++++
Open-ILS/src/sql/Pg/002.schema.config.sql | 2 +-
Open-ILS/src/sql/Pg/950.data.seed-values.sql | 12 ++++++++++++
.../0805.schema.desk_renewal_reuse_circ_lib.sql | 18 ++++++++++++++++++
.../desk-renewal-at-original-circ-lib.txt | 8 ++++++++
5 files changed, 54 insertions(+), 1 deletions(-)
create mode 100644 Open-ILS/src/sql/Pg/upgrade/0805.schema.desk_renewal_reuse_circ_lib.sql
create mode 100644 docs/RELEASE_NOTES_NEXT/Circulation/desk-renewal-at-original-circ-lib.txt
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list