[open-ils-commits] [GIT] Evergreen ILS branch master updated. 33206c48b22e811eda7e4902d9e593b5343260a0
Evergreen Git
git at git.evergreen-ils.org
Thu Sep 12 16:41: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 33206c48b22e811eda7e4902d9e593b5343260a0 (commit)
from 777798d9e99977c35604e99f14f20217276af32a (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 33206c48b22e811eda7e4902d9e593b5343260a0
Author: Bill Erickson <berick at esilibrary.com>
Date: Fri Aug 30 16:49:58 2013 -0400
LP#856688 OUS to disable org unit as hold pickup lib
YAOUS that removes an org unit from consideration as a hold pickup
library. This setting only affects the OPAC display and does not
otherwise affect the display of the org unit in the OPAC. (In other
words, it's not the same thing as actor.org_unit.opac_visible). It also
has no affect on hold targeting / capturing.
[LFW: Numbered upgrade script.]
Signed-off-by: Bill Erickson <berick at esilibrary.com>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous 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 1654fb2..64d9042 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 ('0827', :eg_version); -- rsteed/miker
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0828', :eg_version); -- berick/senator
CREATE TABLE config.bib_source (
id SERIAL PRIMARY KEY,
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 5a0d7ba..30e6b3e 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -13338,3 +13338,22 @@ VALUES (
);
+
+
+INSERT into config.org_unit_setting_type
+ (name, grp, label, description, datatype)
+VALUES (
+ 'opac.holds.org_unit_not_pickup_lib',
+ 'opac',
+ oils_i18n_gettext('opac.holds.org_unit_not_pickup_lib',
+ 'OPAC: Org Unit is not a hold pickup library',
+ 'coust', 'label'),
+ oils_i18n_gettext('opac.holds.org_unit_not_pickup_lib',
+ 'If set, this org unit will not be offered to the patron as an '||
+ 'option for a hold pickup location. This setting has no affect '||
+ 'on searching or hold targeting',
+ 'coust', 'description'),
+ 'bool'
+);
+
+
diff --git a/Open-ILS/src/sql/Pg/upgrade/0828.data.org-not-pickup.sql b/Open-ILS/src/sql/Pg/upgrade/0828.data.org-not-pickup.sql
new file mode 100644
index 0000000..0b5120a
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/0828.data.org-not-pickup.sql
@@ -0,0 +1,22 @@
+BEGIN;
+
+SELECT evergreen.upgrade_deps_block_check('0828', :eg_version);
+
+INSERT into config.org_unit_setting_type
+ (name, grp, label, description, datatype)
+VALUES (
+ 'opac.holds.org_unit_not_pickup_lib',
+ 'opac',
+ oils_i18n_gettext('opac.holds.org_unit_not_pickup_lib',
+ 'OPAC: Org Unit is not a hold pickup library',
+ 'coust', 'label'),
+ oils_i18n_gettext('opac.holds.org_unit_not_pickup_lib',
+ 'If set, this org unit will not be offered to the patron as an '||
+ 'option for a hold pickup location. This setting has no affect '||
+ 'on searching or hold targeting',
+ 'coust', 'description'),
+ 'bool'
+);
+
+COMMIT;
+
diff --git a/Open-ILS/src/templates/opac/myopac/holds/edit.tt2 b/Open-ILS/src/templates/opac/myopac/holds/edit.tt2
index 3415546..271cdad 100644
--- a/Open-ILS/src/templates/opac/myopac/holds/edit.tt2
+++ b/Open-ILS/src/templates/opac/myopac/holds/edit.tt2
@@ -48,7 +48,8 @@
</th>
<td>
[% INCLUDE build_org_selector
- name='pickup_lib' value=ahr.pickup_lib can_have_vols_only=1 %]
+ name='pickup_lib' value=ahr.pickup_lib
+ can_have_vols_only=1 hold_pickup_lib=1 %]
</td>
</tr>
[% IF hold.hold.status < 3 OR hold.hold.status == 7 %]
diff --git a/Open-ILS/src/templates/opac/parts/org_selector.tt2 b/Open-ILS/src/templates/opac/parts/org_selector.tt2
index 4625023..0246628 100644
--- a/Open-ILS/src/templates/opac/parts/org_selector.tt2
+++ b/Open-ILS/src/templates/opac/parts/org_selector.tt2
@@ -97,6 +97,11 @@ BLOCK build_org_selector;
selected = 'selected="selected"';
END;
+ IF hold_pickup_lib AND ctx.get_org_setting(
+ org_unit.id, 'opac.holds.org_unit_not_pickup_lib');
+ disabled = 'disabled="disabled"';
+ END;
+
# caller provided a list of valid org units.
# all orgs not in the list are marked invalid.
IF valid_org_list AND
diff --git a/Open-ILS/src/templates/opac/parts/place_hold.tt2 b/Open-ILS/src/templates/opac/parts/place_hold.tt2
index 07bdcc7..9b410fb 100644
--- a/Open-ILS/src/templates/opac/parts/place_hold.tt2
+++ b/Open-ILS/src/templates/opac/parts/place_hold.tt2
@@ -72,7 +72,9 @@
[%- org_select_id = 'pickup_lib'; -%]
<label for="[% org_select_id %]">[%l('Pickup location:') %]</label>
[% PROCESS "opac/parts/org_selector.tt2";
- INCLUDE build_org_selector name='pickup_lib' value=ctx.default_pickup_lib id=org_select_id can_have_vols_only=1 %]
+ INCLUDE build_org_selector name='pickup_lib'
+ value=ctx.default_pickup_lib id=org_select_id
+ can_have_vols_only=1 hold_pickup_lib=1 %]
</p>
<p>
[% l('Notify when hold is ready for pickup?') %]
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/src/sql/Pg/002.schema.config.sql | 2 +-
Open-ILS/src/sql/Pg/950.data.seed-values.sql | 19 +++++++++++++++++
.../sql/Pg/upgrade/0828.data.org-not-pickup.sql | 22 ++++++++++++++++++++
Open-ILS/src/templates/opac/myopac/holds/edit.tt2 | 3 +-
Open-ILS/src/templates/opac/parts/org_selector.tt2 | 5 ++++
Open-ILS/src/templates/opac/parts/place_hold.tt2 | 4 ++-
6 files changed, 52 insertions(+), 3 deletions(-)
create mode 100644 Open-ILS/src/sql/Pg/upgrade/0828.data.org-not-pickup.sql
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list