From: Jason Stephenson Date: Thu, 17 Nov 2011 21:22:14 +0000 (-0500) Subject: More fix lp851000. X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=b80911e59e065afdd6165d4ebd776a5baba4e0e0;p=working%2FEvergreen.git More fix lp851000. Remove references to the, now useless, circ.lost_immediately_available org unit setting. Delete it from the 950.data.seed-values.sql and from OpenILS/Const.pm. Conflicts: Open-ILS/src/sql/Pg/950.data.seed-values.sql Signed-off-by: Jason Stephenson --- diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Const.pm b/Open-ILS/src/perlmods/lib/OpenILS/Const.pm index 6da2ed60aa..f6ed005038 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/Const.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/Const.pm @@ -89,7 +89,6 @@ econst OILS_SETTING_VOID_LOST_ON_CHECKIN => 'circ.void_lost_on_ch econst OILS_SETTING_MAX_ACCEPT_RETURN_OF_LOST => 'circ.max_accept_return_of_lost'; econst OILS_SETTING_VOID_LOST_PROCESS_FEE_ON_CHECKIN => 'circ.void_lost_proc_fee_on_checkin'; econst OILS_SETTING_RESTORE_OVERDUE_ON_LOST_RETURN => 'circ.restore_overdue_on_lost_return'; -econst OILS_SETTING_LOST_IMMEDIATELY_AVAILABLE => 'circ.lost_immediately_available'; econst OILS_SETTING_BLOCK_HOLD_FOR_EXPIRED_PATRON => 'circ.holds.expired_patron_block'; 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 43c3892a0f..aab2e18cdf 100644 --- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql +++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql @@ -2500,11 +2500,6 @@ INSERT into config.org_unit_setting_type oils_i18n_gettext('circ.restore_overdue_on_lost_return', 'Restore overdue fines on lost item return', 'coust', 'description'), 'bool'), -( 'circ.lost_immediately_available', - oils_i18n_gettext('circ.lost_immediately_available', 'Circ: Lost items usable on checkin', 'coust', 'label'), - oils_i18n_gettext('circ.lost_immediately_available', 'Lost items are usable on checkin instead of going ''home'' first', 'coust', 'description'), - 'bool'), - ( 'circ.holds_fifo', oils_i18n_gettext('circ.holds_fifo', 'Holds: FIFO', 'coust', 'label'), oils_i18n_gettext('circ.holds_fifo', 'Force holds to a more strict First-In, First-Out capture', 'coust', 'description'),