[open-ils-commits] [GIT] Evergreen ILS branch master updated. 8decad6183c9c3786377bd59eae8c55472ab35c4
Evergreen Git
git at git.evergreen-ils.org
Wed Aug 24 18:08:54 EDT 2016
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 8decad6183c9c3786377bd59eae8c55472ab35c4 (commit)
via a5f6a489ea0436b085831fcf033ca176c61204f9 (commit)
via 58cd99ec3a4f83fd2d68b2e732069587c70b1459 (commit)
via 49ea249d5f7d315aa7bf1980edb4c7ea961f7833 (commit)
via fcc46ccaa72260f8dc970df156985c983f1e19f4 (commit)
via 6c27a324d4665b7c64d37784ac339037bdb31423 (commit)
from c820aa492739c544e09a7b646a09b8507ae3993b (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 8decad6183c9c3786377bd59eae8c55472ab35c4
Author: Mike Rylander <mrylander at gmail.com>
Date: Wed Aug 24 18:07:13 2016 -0400
Stamping upgrade script for Canceled Transit status branch
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 7e098c0..d696187 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 ('0996', :eg_version); -- gmcharlt/miker
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0997', :eg_version); -- csharp/miker
CREATE TABLE config.bib_source (
id SERIAL PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.canceled-transit-item-status.sql b/Open-ILS/src/sql/Pg/upgrade/0997.data.canceled-transit-item-status.sql
similarity index 71%
rename from Open-ILS/src/sql/Pg/upgrade/XXXX.data.canceled-transit-item-status.sql
rename to Open-ILS/src/sql/Pg/upgrade/0997.data.canceled-transit-item-status.sql
index d4817f9..d4a5b6b 100644
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.canceled-transit-item-status.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/0997.data.canceled-transit-item-status.sql
@@ -1,6 +1,6 @@
BEGIN;
-SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
+SELECT evergreen.upgrade_deps_block_check('0997', :eg_version);
INSERT INTO config.copy_status (id, name, holdable, opac_visible) VALUES (18,oils_i18n_gettext(18, 'Canceled Transit', 'ccs', 'name'), 't', 't');
commit a5f6a489ea0436b085831fcf033ca176c61204f9
Author: Chris Sharp <csharp at georgialibraries.org>
Date: Wed Aug 24 14:23:09 2016 -0400
LP#1613374 - Check stored copy status before clobbering it.
Some transit.copy_statuses would result in some other behavior
upon checkin, so we check all that would go into 'Reshelving'
status, otherwise, restore the stored status.
Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
Signed-off-by: Michele Morgan <mmorgan at noblenet.org>
Signed-off-by: Mike Rylander <mrylander at gmail.com>
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Transit.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Transit.pm
index 88b706b..fad7923 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Transit.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Transit.pm
@@ -245,8 +245,21 @@ sub __abort_transit {
# Only change the copy status if the copy status is "In Transit."
if ($copy->status == OILS_COPY_STATUS_IN_TRANSIT) {
- # recover the copy status
- $copy->status( OILS_COPY_STATUS_CANCELED_TRANSIT );
+ # if the status would normally result in 'Reshelving' once the item is checked in
+ if ($transit->copy_status == OILS_COPY_STATUS_AVAILABLE ||
+ $transit->copy_status == OILS_COPY_STATUS_CHECKED_OUT ||
+ $transit->copy_status == OILS_COPY_STATUS_IN_PROCESS ||
+ $transit->copy_status == OILS_COPY_STATUS_ON_HOLDS_SHELF ||
+ $transit->copy_status == OILS_COPY_STATUS_IN_TRANSIT ||
+ $transit->copy_status == OILS_COPY_STATUS_CATALOGING ||
+ $transit->copy_status == OILS_COPY_STATUS_ON_RESV_SHELF ||
+ $transit->copy_status == OILS_COPY_STATUS_RESHELVING) {
+ # set copy to Canceled Transit
+ $copy->status( OILS_COPY_STATUS_CANCELED_TRANSIT);
+ } else {
+ # recover the copy status
+ $copy->status($transit->copy_status);
+ }
$copy->editor( $e->requestor->id );
$copy->edit_date('now');
commit 58cd99ec3a4f83fd2d68b2e732069587c70b1459
Author: Chris Sharp <csharp at georgialibraries.org>
Date: Tue Aug 23 09:32:59 2016 -0400
LP#1613374 - Add 'Canceled Transit' to non-'BAD' copy statuses.
During checkin, Circulate.pm checks the copy status and if it
isn't listed as an okay status, the event COPY_BAD_STATUS is
returned, which requires an override. This change makes copies
in 'Canceled Transit' status check in without an alert.
Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
Signed-off-by: Michele Morgan <mmorgan at noblenet.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 6ce9eb8..dcef1d2 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm
@@ -3530,6 +3530,7 @@ sub check_checkin_copy_status {
$status == OILS_COPY_STATUS_IN_TRANSIT ||
$status == OILS_COPY_STATUS_CATALOGING ||
$status == OILS_COPY_STATUS_ON_RESV_SHELF ||
+ $status == OILS_COPY_STATUS_CANCELED_TRANSIT ||
$status == OILS_COPY_STATUS_RESHELVING );
return OpenILS::Event->new('COPY_STATUS_LOST', payload => $copy )
commit 49ea249d5f7d315aa7bf1980edb4c7ea961f7833
Author: Chris Sharp <csharp at georgialibraries.org>
Date: Tue Aug 16 07:11:24 2016 -0400
LP#1613374 - Add 'Canceled Transit' to "magical statuses"
Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
Signed-off-by: Michele Morgan <mmorgan at noblenet.org>
Signed-off-by: Mike Rylander <mrylander at gmail.com>
diff --git a/Open-ILS/xul/staff_client/chrome/content/main/constants.js b/Open-ILS/xul/staff_client/chrome/content/main/constants.js
index 0165ec5..8f2e313 100644
--- a/Open-ILS/xul/staff_client/chrome/content/main/constants.js
+++ b/Open-ILS/xul/staff_client/chrome/content/main/constants.js
@@ -44,7 +44,8 @@ var my_constants = {
'3' : { 'disable_in_copy_editor' : true, 'block_mark_item_damaged' : false, 'block_mark_item_action' : true }, /* | Lost | f */
'6' : { 'disable_in_copy_editor' : true, 'block_mark_item_damaged' : false, 'block_mark_item_action' : true }, /* | In transit | t */
'8' : { 'disable_in_copy_editor' : true, 'block_mark_item_damaged' : false, 'block_mark_item_action' : false }, /* | On holds shelf | t */
- '16' : { 'disable_in_copy_editor' : true, 'block_mark_item_damaged' : false, 'block_mark_item_action' : true } /* | Long Overdue | f */
+ '16' : { 'disable_in_copy_editor' : true, 'block_mark_item_damaged' : false, 'block_mark_item_action' : true }, /* | Long Overdue | f */
+ '18' : { 'disable_in_copy_editor' : true, 'block_mark_item_damaged' : false, 'block_mark_item_action' : false} /* | Canceled Transit | t */
}
}
commit fcc46ccaa72260f8dc970df156985c983f1e19f4
Author: Chris Sharp <csharp at georgialibraries.org>
Date: Mon Aug 22 08:58:24 2016 -0400
LP#1613374 - Make 'Canceled Transit' status holdable and OPAC-visible.
Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
Signed-off-by: Michele Morgan <mmorgan at noblenet.org>
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 1ffa333..f00d040 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -328,7 +328,7 @@ INSERT INTO config.copy_status
INSERT INTO config.copy_status
(id, name, holdable, opac_visible, copy_active, restrict_copy_delete)
VALUES (17, 'Lost and Paid', FALSE, FALSE, FALSE, TRUE);
-INSERT INTO config.copy_status(id,name) VALUES (18,oils_i18n_gettext(18, 'Canceled Transit', 'ccs', 'name'));
+INSERT INTO config.copy_status(id,name,holdable,opac_visible) VALUES (18,oils_i18n_gettext(18, 'Canceled Transit', 'ccs', 'name'),'t','t');
SELECT SETVAL('config.copy_status_id_seq'::TEXT, 100);
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.canceled-transit-item-status.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.canceled-transit-item-status.sql
index 0ce261e..d4817f9 100644
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.canceled-transit-item-status.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.canceled-transit-item-status.sql
@@ -2,6 +2,6 @@ BEGIN;
SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
-INSERT INTO config.copy_status (id, name) VALUES (18,oils_i18n_gettext(18, 'Canceled Transit', 'ccs', 'name'));
+INSERT INTO config.copy_status (id, name, holdable, opac_visible) VALUES (18,oils_i18n_gettext(18, 'Canceled Transit', 'ccs', 'name'), 't', 't');
COMMIT;
commit 6c27a324d4665b7c64d37784ac339037bdb31423
Author: Chris Sharp <csharp at georgialibraries.org>
Date: Wed Aug 24 14:12:04 2016 -0400
LP#1613374 - Set item status to 'Canceled Transit' when transit is canceled.
I opened a separate bug report on this issue (bug 1613374) before realizing
bug 1306666 was reported. This commit creates a new 'Canceled Transit' status
that signals to staff what happened to an item when a transit is aborted/canceled.
Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
Signed-off-by: Mike Rylander <mrylander at gmail.com>
Conflicts:
Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Transit.pm
Signed-off-by: Michele Morgan <mmorgan at noblenet.org>
Signed-off-by: Mike Rylander <mrylander at gmail.com>
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Transit.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Transit.pm
index 73abe82..88b706b 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Transit.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Transit.pm
@@ -246,18 +246,13 @@ sub __abort_transit {
# Only change the copy status if the copy status is "In Transit."
if ($copy->status == OILS_COPY_STATUS_IN_TRANSIT) {
# recover the copy status
- $copy->status( $transit->copy_status );
+ $copy->status( OILS_COPY_STATUS_CANCELED_TRANSIT );
$copy->editor( $e->requestor->id );
$copy->edit_date('now');
- if ( $holdtransit ) {
- $logger->info("setting copy to reshelving on hold transit abort");
- $copy->status( OILS_COPY_STATUS_RESHELVING );
- }
return $e->die_event unless $e->update_asset_copy($copy);
}
-
$e->commit unless $no_commit;
# if this is a hold transit, un-capture/un-target the hold
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Const.pm b/Open-ILS/src/perlmods/lib/OpenILS/Const.pm
index cd82e83..c568d89 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Const.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Const.pm
@@ -44,7 +44,7 @@ econst OILS_COPY_STATUS_DAMAGED => 14;
econst OILS_COPY_STATUS_ON_RESV_SHELF => 15;
econst OILS_COPY_STATUS_LONG_OVERDUE => 16;
econst OILS_COPY_STATUS_LOST_AND_PAID => 17;
-
+econst OILS_COPY_STATUS_CANCELED_TRANSIT => 18;
# ---------------------------------------------------------------------
# Circ defaults for pre-cataloged copies
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 72b7029..1ffa333 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -328,6 +328,7 @@ INSERT INTO config.copy_status
INSERT INTO config.copy_status
(id, name, holdable, opac_visible, copy_active, restrict_copy_delete)
VALUES (17, 'Lost and Paid', FALSE, FALSE, FALSE, TRUE);
+INSERT INTO config.copy_status(id,name) VALUES (18,oils_i18n_gettext(18, 'Canceled Transit', 'ccs', 'name'));
SELECT SETVAL('config.copy_status_id_seq'::TEXT, 100);
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.canceled-transit-item-status.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.canceled-transit-item-status.sql
new file mode 100644
index 0000000..0ce261e
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.canceled-transit-item-status.sql
@@ -0,0 +1,7 @@
+BEGIN;
+
+SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
+
+INSERT INTO config.copy_status (id, name) VALUES (18,oils_i18n_gettext(18, 'Canceled Transit', 'ccs', 'name'));
+
+COMMIT;
-----------------------------------------------------------------------
Summary of changes:
.../lib/OpenILS/Application/Circ/Circulate.pm | 1 +
.../lib/OpenILS/Application/Circ/Transit.pm | 22 +++++++++++++------
Open-ILS/src/perlmods/lib/OpenILS/Const.pm | 2 +-
Open-ILS/src/sql/Pg/002.schema.config.sql | 2 +-
Open-ILS/src/sql/Pg/950.data.seed-values.sql | 1 +
.../0997.data.canceled-transit-item-status.sql | 7 ++++++
.../staff_client/chrome/content/main/constants.js | 3 +-
7 files changed, 28 insertions(+), 10 deletions(-)
create mode 100644 Open-ILS/src/sql/Pg/upgrade/0997.data.canceled-transit-item-status.sql
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list