[open-ils-commits] [GIT] Evergreen ILS branch rel_1_6_2_4 created. 8d3f6724ac48cb91e70437021eaf96754c800de5
Evergreen Git
git at git.evergreen-ils.org
Mon May 23 10:41:16 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, rel_1_6_2_4 has been created
at 8d3f6724ac48cb91e70437021eaf96754c800de5 (commit)
- Log -----------------------------------------------------------------
commit 8d3f6724ac48cb91e70437021eaf96754c800de5
Author: Mike Rylander <mrylander at gmail.com>
Date: Mon May 23 10:39:59 2011 -0400
Adjusting change log
diff --git a/ChangeLog b/ChangeLog
index 3323187..62bad91 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1 +1,104 @@
-#ChangeLog
+2011-05-23 Mike Rylander <mrylander at gmail.com>
+
+ * Open-ILS/src/perlmods/OpenILS/Application.pm,
+ Open-ILS/src/sql/Pg/002.schema.config.sql, README: Bumping version
+ numbers Signed-off-by: Mike Rylander <mrylander at gmail.com>
+
+2011-05-12 miker <miker at dcc99617-32d9-48b4-a31d-7c20da2025e4>
+
+ * Open-ILS/src/perlmods/OpenILS/Application/Vandelay.pm: Address
+ LP#779975; Status of Available (0) not honored because 0==false --
+ use ternary op with defined() instead git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@20454
+ dcc99617-32d9-48b4-a31d-7c20da2025e4 (cherry picked from commit
+ 2d96fea0800a99092acdc97330b33b3d421f3098) Signed-off-by: Mike Rylander <mrylander at gmail.com>
+
+2011-04-26 phasefx <phasefx at dcc99617-32d9-48b4-a31d-7c20da2025e4>
+
+ * Open-ILS/xul/staff_client/server/circ/checkin.js: fix disappearing
+ cursor/caret for Check In git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_2@20318
+ dcc99617-32d9-48b4-a31d-7c20da2025e4
+
+2011-04-22 gmc <gmc at dcc99617-32d9-48b4-a31d-7c20da2025e4>
+
+ * Open-ILS/src/sql/Pg/1.6.1.4-1.6.1.5-db-upgrade.sql: LP#768983 -
+ fix version stamp in 1.6.1.4-1.6.1.5 upgrade script Signed-off-by: Galen Charlton <gmc at esilibrary.com> git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_2@20284
+ dcc99617-32d9-48b4-a31d-7c20da2025e4
+
+2011-04-20 miker <miker at dcc99617-32d9-48b4-a31d-7c20da2025e4>
+
+ * Open-ILS/src/support-scripts/offline-blocked-list.pl: Patch from
+ Jeff Davis addressing parameter usage issues git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_2@20248
+ dcc99617-32d9-48b4-a31d-7c20da2025e4
+
+2011-04-18 phasefx <phasefx at dcc99617-32d9-48b4-a31d-7c20da2025e4>
+
+ * Open-ILS/xul/staff_client/server/cat/marcedit.xul: in the MARC
+ Editor, put the callnumber and barcode textboxes for Fast Item Add
+ on a separate row git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_2@20155
+ dcc99617-32d9-48b4-a31d-7c20da2025e4
+
+2011-04-18 phasefx <phasefx at dcc99617-32d9-48b4-a31d-7c20da2025e4>
+
+ * Open-ILS/xul/staff_client/server/cat/spine_labels.xul: font_helper
+ in this version depends on JSAN being set up by my_init() git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_2@20142
+ dcc99617-32d9-48b4-a31d-7c20da2025e4
+
+2011-04-15 phasefx <phasefx at dcc99617-32d9-48b4-a31d-7c20da2025e4>
+
+ * Open-ILS/xul/staff_client/server/cat/spine_labels.xul: label
+ interface, run persist_helper() before my_init(), since the latter
+ depends on values set by the former git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_2@20110
+ dcc99617-32d9-48b4-a31d-7c20da2025e4
+
+2011-04-15 miker <miker at dcc99617-32d9-48b4-a31d-7c20da2025e4>
+
+ * Open-ILS/src/c-apps/oils_cstore.c: Backported version of r20094:
+ Protect pcrud-ish retrieve from an empty result set git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_2@20098
+ dcc99617-32d9-48b4-a31d-7c20da2025e4
+
+2011-04-07 phasefx <phasefx at dcc99617-32d9-48b4-a31d-7c20da2025e4>
+
+ * Open-ILS/web/opac/skin/default/js/myopac.js: test for pre-cat
+ slightly off in OPAC My Account, spotted by Steve Callender git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_2@20022
+ dcc99617-32d9-48b4-a31d-7c20da2025e4
+
+2011-03-29 miker <miker at dcc99617-32d9-48b4-a31d-7c20da2025e4>
+
+ * Open-ILS/src/perlmods/OpenILS/SIP/Patron.pm: Patch from Brandon
+ Uhlman addressing SIP2 unavailable holds display. The unavail_holds() function in OpenILS::SIP::Patron is a
+ placeholder that returns an empty set, instead of an actual list of
+ a patrons' holds not cur rently ready for pickup. When an SC determines whether a patron has holds ready for pickup by
+ comparing the cardinalities of hold_items() and unavail_holds() [*]
+ using the exi sting unavail_holds() logic, it effectively reports
+ every currently placed hold as ready for pickup, which is generally
+ not true. The attached patch assumes that unavailable holds are those that
+ meet one of two sets of conditions: - hold requests that are not cancelled (cancel_time = null), not
+ fulfilled (fulfillment time = null), and not captured (capture_time
+ = null) - hold requests that are neither cancelled nor fulfilled (as above),
+ are captured (capture_time != null), and for which, additionally,
+ the current_cop y does not have the status 'On holds shelf' (status
+ = 8). The only items that should meet this condition are those that
+ are in transit to a location w here they will be added to the holds
+ shelf. The patch iterates through the items meeting each condition, and
+ adds them to a master list of relevant holds, which it then
+ processes (in the same wa y that hold_items is processed) and
+ returns. This patch was developed against and tested on rel_1_6_0 from SVN (~
+ 1.6.0.2), but should apply cleanly against current rel_1_6_0 and
+ trunk; OpenSRF 1 .2.2, PostgreSQL 8.3.8, Ubuntu Hardy 64-bit. [*] The two cardinalities are returned by SIP message 64 as
+ fixed-length integers in positions 35-38 and 55-58 respectively, so
+ we don't need to itera te through the list ourseles. git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_2@19897
+ dcc99617-32d9-48b4-a31d-7c20da2025e4
+
+2011-03-21 miker <miker at dcc99617-32d9-48b4-a31d-7c20da2025e4>
+
+ * Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_summary.xml:
+ Make sure "ol" propagates through BibTemplate subject search links
+ for OPAC range hiding git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_2@19836
+ dcc99617-32d9-48b4-a31d-7c20da2025e4
+
+2011-03-18 miker <miker at dcc99617-32d9-48b4-a31d-7c20da2025e4>
+
+ * Allow the "result_field" to be used as the default alias in the
+ output column of a row or set returning transform git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_2@19803
+ dcc99617-32d9-48b4-a31d-7c20da2025e4
+
commit 1f8c5adf353e679e8683e7ef69932a0ab5902958
Author: Mike Rylander <mrylander at gmail.com>
Date: Mon May 23 10:15:52 2011 -0400
Bumping version numbers and...
Reapplication of:
Address LP#779975; Status of Available (0) not honored because 0==false -- use ternary op with defined() instead
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@20454 dcc99617-32d9-48b4-a31d-7c20da2025e4
(cherry picked from commit 2d96fea0800a99092acdc97330b33b3d421f3098)
Signed-off-by: Mike Rylander <mrylander at gmail.com>
diff --git a/Open-ILS/src/perlmods/OpenILS/Application.pm b/Open-ILS/src/perlmods/OpenILS/Application.pm
index 8b77ab0..1ff8648 100644
--- a/Open-ILS/src/perlmods/OpenILS/Application.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Application.pm
@@ -5,7 +5,7 @@ use base qw/OpenSRF::Application/;
sub ils_version {
# version format is "x-y-z-p", for example "1-2-1-0" for Evergreen 1.2.1.0
- return "1-6";
+ return "1-6-2-4";
}
__PACKAGE__->register_method(
diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/actor.pm b/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/actor.pm
index d27e6a8..343eae6 100644
--- a/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/actor.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/actor.pm
@@ -196,10 +196,8 @@ sub calc_proximity {
actor.org_unit r;
SQL
- $self->method_lookup('open-ils.storage.transaction.begin')->run;
actor::org_unit_proximity->db_Main->do($delete_sql);
actor::org_unit_proximity->db_Main->do($insert_sql);
- $self->method_lookup('open-ils.storage.transaction.commit')->run;
return 1;
}
diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Vandelay.pm b/Open-ILS/src/perlmods/OpenILS/Application/Vandelay.pm
index 570eeab..35287a9 100644
--- a/Open-ILS/src/perlmods/OpenILS/Application/Vandelay.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Application/Vandelay.pm
@@ -928,7 +928,7 @@ sub import_record_asset_list_impl {
$copy->barcode($item->barcode);
$copy->location($item->location);
$copy->circ_lib($item->circ_lib || $item->owning_lib);
- $copy->status($item->status || OILS_COPY_STATUS_IN_PROCESS);
+ $copy->status( defined($item->status) ? $item->status : OILS_COPY_STATUS_IN_PROCESS );
$copy->circulate($item->circulate);
$copy->deposit($item->deposit);
$copy->deposit_amount($item->deposit_amount);
diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index 46a7ad5..48fc73e 100644
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -51,6 +51,7 @@ CREATE TABLE config.upgrade_log (
install_date TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW()
);
+INSERT INTO config.upgrade_log (version) VALUES ('1.6.2.4');
INSERT INTO config.upgrade_log (version) VALUES ('0485'); -- dbs
CREATE TABLE config.bib_source (
diff --git a/README b/README
index 0243787..66aa634 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-README for Evergreen 1.6
+README for Evergreen 1.6.2.4
Installing prerequisites:
========================
@@ -40,7 +40,7 @@ Installation instructions:
Once you have configured and compiled Evergreen, issue the following
command as the root user to install Evergreen:
-make STAFF_CLIENT_BUILD_ID=rel_1_6_0_0 install
+make STAFF_CLIENT_BUILD_ID=rel_1_6_2_4 install
This will install Evergreen, including example configuration files in
/openils/conf/ that you can use as templates for your own configuration files.
commit af57754ae32ae3c78527439e0c0e12699b658f07
Author: Mike Rylander <mrylander at gmail.com>
Date: Mon May 23 10:13:46 2011 -0400
Revert "Address LP#779975; Status of Available (0) not honored because 0==false -- use ternary op with defined() instead"
This reverts commit e823edef09799bcfa11ea34e3c51dd608af00a76.
diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Vandelay.pm b/Open-ILS/src/perlmods/OpenILS/Application/Vandelay.pm
index 35287a9..570eeab 100644
--- a/Open-ILS/src/perlmods/OpenILS/Application/Vandelay.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Application/Vandelay.pm
@@ -928,7 +928,7 @@ sub import_record_asset_list_impl {
$copy->barcode($item->barcode);
$copy->location($item->location);
$copy->circ_lib($item->circ_lib || $item->owning_lib);
- $copy->status( defined($item->status) ? $item->status : OILS_COPY_STATUS_IN_PROCESS );
+ $copy->status($item->status || OILS_COPY_STATUS_IN_PROCESS);
$copy->circulate($item->circulate);
$copy->deposit($item->deposit);
$copy->deposit_amount($item->deposit_amount);
-----------------------------------------------------------------------
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list