]> git.evergreen-ils.org Git - Evergreen.git/log
Evergreen.git
13 years agobumping version numbers tags/rel_1_6_1_5
miker [Fri, 10 Dec 2010 21:04:16 +0000 (21:04 +0000)]
bumping version numbers

git-svn-id: svn://svn.open-ils.org/ILS/tags/rel_1_6_1_5@18982 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agoTagging 1.6.1.5
miker [Fri, 10 Dec 2010 20:39:27 +0000 (20:39 +0000)]
Tagging 1.6.1.5

git-svn-id: svn://svn.open-ils.org/ILS/tags/rel_1_6_1_5@18975 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agobackport r14033 from trunk for unsetting (nullifying) a circ modifier
phasefx [Fri, 10 Dec 2010 18:37:29 +0000 (18:37 +0000)]
backport r14033 from trunk for unsetting (nullifying) a circ modifier

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@18971 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agoPatch from James Fournie to address https://bugs.launchpad.net/evergreen/+bug/622908...
miker [Fri, 10 Dec 2010 17:21:09 +0000 (17:21 +0000)]
Patch from James Fournie to address https://bugs.launchpad.net/evergreen/+bug/622908 wherein we learn that related item physical description might be used as the main PD of the main item, if the main item lacks such a field in the MARC

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@18966 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agoPrepping for 1.6.1.5 with initial upgrade script.
miker [Fri, 10 Dec 2010 15:17:46 +0000 (15:17 +0000)]
Prepping for 1.6.1.5 with initial upgrade script.

Addressing https://bugs.launchpad.net/evergreen/+bug/638309 -- Thanks to Steve Callender for the original report and diagnosis.

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@18962 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agobig thinko. Going by the stock receipt template, this should be the workstation...
phasefx [Thu, 9 Dec 2010 18:26:54 +0000 (18:26 +0000)]
big thinko.  Going by the stock receipt template, this should be the workstation lib.  Destination is handled by a different variable

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@18953 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agotransit isn't in payload first time through with ROUTE_ITEM checkin, fallback on...
phasefx [Thu, 9 Dec 2010 18:14:10 +0000 (18:14 +0000)]
transit isn't in payload first time through with ROUTE_ITEM checkin, fallback on check.org

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@18949 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agoEnable Ingest to ingest multiple located URIs for a single org-unit at once
dbs [Thu, 9 Dec 2010 04:45:29 +0000 (04:45 +0000)]
Enable Ingest to ingest multiple located URIs for a single org-unit at once

Previous logic incorrectly restricted a given bib record to have one located
URI per org-unit - unless you reingested it multiple times, each time adding
one more URI per org-unit.

We also add the strict pragma and adjust some syntax accordingly.

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@18939 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agoBe consistent with a misspelled field. Credit to Robert Soulliere for pointing
senator [Fri, 3 Dec 2010 15:29:38 +0000 (15:29 +0000)]
Be consistent with a misspelled field. Credit to Robert Soulliere for pointing
out my mistaken understanding of where this was already fixed and where it
wasn't.

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@18910 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agoNormalize spaces in notcontains advance search query terms to address bug https:...
miker [Fri, 3 Dec 2010 15:11:02 +0000 (15:11 +0000)]
Normalize spaces in notcontains advance search query terms to address bug https://bugs.launchpad.net/evergreen/+bug/677122

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@18909 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agoBelated backport of r18688 from trunk
senator [Thu, 2 Dec 2010 21:16:39 +0000 (21:16 +0000)]
Belated backport of r18688 from trunk

Booking: fix bug reported by Robert Soulliere wherein the items associated
with picked-up reservations didn't actually get their status set to 'checked
out' like they should have.

Robert reported this bug on Launchpad (#672748) and provided a patch, but
there were some neighboring bugs in the circulation logic anyway, so they've
all been fixed together.

Update: Robert and I aren't yet actually certain whether this fixed the problem
when using legacy circ scripts.  Investigation continues on Launchpad.

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@18904 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agoprotect some of the supercat browse interfaces from unboundedness
gmc [Tue, 30 Nov 2010 20:50:32 +0000 (20:50 +0000)]
protect some of the supercat browse interfaces from unboundedness

E.g., browsing from a call number that contains forward slashes, e.g.,

"02/05/2004"

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@18887 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agoBackport some booking related commits from trunk.
senator [Tue, 30 Nov 2010 15:53:18 +0000 (15:53 +0000)]
Backport some booking related commits from trunk.

r17563: Booking: stop the "new resource type" dialog from executing a naughty
query

The dialog will no longer offer a field for selecting a bibliographic record,
but then again you wouldn't need it.  Bibliographically-based resource types
can be set up through a context menu option in the staff OPAC browser, whereas
this interface is only suited to non-bib-based resource types, like meeting
rooms, laptops, etc.
--
r17980: more transaction cleanups
--
r18502: Booking: make the circ module avoid booking code if the booking service
isn't up

Previously, it was not possible to turn the booking service off and have
working circ.  Now you should be able to turn it off if you don't need it.
--
r18514: If we already know we're not using booking, skip a redundant and
expensive test for the possibility of capturing a hold. We're just going to
try actually doing it a little farther down.
--
r18580: Patch from Steve Callender to address a booking-related collection
agency reporting problem

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@18874 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agoback-porting cstoreditor fixes to help prevent transaction leaking
erickson [Tue, 30 Nov 2010 14:05:09 +0000 (14:05 +0000)]
back-porting cstoreditor fixes to help prevent transaction leaking

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@18872 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agologic error (inversion) in retargetting of previous copy when no other holds are...
miker [Mon, 29 Nov 2010 19:48:04 +0000 (19:48 +0000)]
logic error (inversion) in retargetting of previous copy when no other holds are looking at it

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@18861 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agoPatch from Jeff Godin, backported from trunkified version:
miker [Mon, 29 Nov 2010 17:45:56 +0000 (17:45 +0000)]
Patch from Jeff Godin, backported from trunkified version:

In the staff client, the holds context menu option "Edit PickupLibrary" displays and allows selection of org units that it shouldn't.

Org units whose type has can_have_users = FALSE are not valid pickup locations.

Using the default types as an example, CONS and SYS1 are invalid pickup locations.

The OPAC enforces this when allowing patrons to edit a hold.

The staff client does not enforce this when staff edit a hold.

The can_have_users() method of the au object returns a string 't' or 'f' which is then compared to 0.

The attached patch corrects this issue. ( foo == 0 becomes !isTrue(foo) ).

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@18857 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agomerge r18806 from rel_1_6 for caching this setting (at least within a given page...
phasefx [Wed, 24 Nov 2010 15:20:44 +0000 (15:20 +0000)]
merge r18806 from rel_1_6 for caching this setting (at least within a given page load)

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@18844 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agoMerge upgrade script with tagged version
dbs [Fri, 19 Nov 2010 07:48:12 +0000 (07:48 +0000)]
Merge upgrade script with tagged version

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@18802 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agoAdd the missing SQL upgrade script for 1.6.1.4
dbs [Fri, 19 Nov 2010 07:44:36 +0000 (07:44 +0000)]
Add the missing SQL upgrade script for 1.6.1.4

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@18801 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agoback-porting 17292: added custom internal_id handler to SIP patron module
erickson [Thu, 18 Nov 2010 15:13:48 +0000 (15:13 +0000)]
back-porting 17292: added custom internal_id handler to SIP patron module

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@18778 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agobackport r18757 from trunk for opac org hiding extension to place hold pickup lib...
phasefx [Tue, 16 Nov 2010 20:11:52 +0000 (20:11 +0000)]
backport r18757 from trunk for opac org hiding extension to place hold pickup lib menu

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@18759 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agoTrim leading and trailing whitespace from metabib.full_rec values - fixes ISSN quicks...
dbs [Mon, 15 Nov 2010 22:43:58 +0000 (22:43 +0000)]
Trim leading and trailing whitespace from metabib.full_rec values - fixes ISSN quicksearch (thanks for noticing this, Dan Wells!)

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@18753 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agoasset.uri needs a seed entry for queries of its ID values
dbs [Mon, 15 Nov 2010 22:32:04 +0000 (22:32 +0000)]
asset.uri needs a seed entry for queries of its ID values

To fix a problem with ingesting URIs, Ingest.pm was changed to reflect
the maximum asset.uri.id value rather than the asset.call_number.id
value. However, with no entries in asset.uri, the query returned a
NULL object which broke ingest entirely. Adding a seed entry avoids
this problem.

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@18750 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agoBackport r17447 from trunk: don't forget this branch
senator [Mon, 15 Nov 2010 15:46:37 +0000 (15:46 +0000)]
Backport r17447 from trunk: don't forget this branch

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@18739 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agoReverting and extending r18472 to correct implementation thinko
miker [Mon, 15 Nov 2010 15:17:13 +0000 (15:17 +0000)]
Reverting and extending r18472 to correct implementation thinko

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@18737 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agodo not use TRUNCATE when refreshing reporter.materialized_simple_record
gmc [Wed, 10 Nov 2010 13:30:39 +0000 (13:30 +0000)]
do not use TRUNCATE when refreshing reporter.materialized_simple_record

Previous behavior would break Slony replication after doing a
bib load.  Since a deletion is slower than a truncate, if you're
not using Slony replication, you may prefer to truncate rmsr
prior to calling reporter.enable_materialized_simple_record_trigger.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@18680 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agofix user password reset request time column def
gmc [Fri, 5 Nov 2010 17:02:59 +0000 (17:02 +0000)]
fix user password reset request time column def

Needs to be a timestamp with time zone; fixes a bug
where it was interpreted as a UTC time, throwing off
the calculation of the expiration of the password reset
request.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@18623 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agoadjust user tests that get done when retargeting holds
gmc [Thu, 28 Oct 2010 16:15:35 +0000 (16:15 +0000)]
adjust user tests that get done when retargeting holds

Fixes bug where a user having the maximum number of
active hold requests allowed to them by policy would
prevent items from being targeted to fill their requests.

Backport of r18507

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@18525 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agoBackport r18516: Ensure call numbers are returned to the holdings editor in ascending...
dbs [Thu, 28 Oct 2010 15:22:48 +0000 (15:22 +0000)]
Backport r18516: Ensure call numbers are returned to the holdings editor in ascending sorted order

James Fournie in https://bugs.launchpad.net/evergreen/+bug/635121 reported
that call numbers were being displayed in the order that they had been
added to the database, rather than in sorted call number label order.

Although I have been unable to reproduce this problem on two different
test systems, the patch he provided for 1.6.1 (which fixes the problem on their
test system) shouldn't hurt other systems.

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@18522 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agoPrevent ingest errors when asset.uri ID value outstrips asset.call_number
dbs [Wed, 27 Oct 2010 02:25:48 +0000 (02:25 +0000)]
Prevent ingest errors when asset.uri ID value outstrips asset.call_number

We were basing IDs in asset.uri on the max ID of asset.call_number,
which occasionally led to major ingest problems as attempts to insert
the next ID into asset.uri failed because that ID already existed. Using
the max ID from asset.uri for asset.uri inserts seems to make more sense
and does resolve that problem.

The bigger problem of not using the sequences that are already on these
tables to generate the IDs will not be an issue in 2.0, when we move to
in-database ingest and can use the normal lastval() approach to populate
asset.uri_call_number_map with the new values.

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@18483 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agoinclude more information in the debugging dump; correct the "back to index" link
miker [Tue, 26 Oct 2010 14:01:34 +0000 (14:01 +0000)]
include more information in the debugging dump; correct the "back to index" link

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@18472 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agoDump some debugging output from clark; may later make this optional, but we usually...
miker [Mon, 25 Oct 2010 16:26:23 +0000 (16:26 +0000)]
Dump some debugging output from clark; may later make this optional, but we usually need it when looking for the cause of problems.

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@18460 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agoimprove call number sorting
gmc [Thu, 21 Oct 2010 14:54:44 +0000 (14:54 +0000)]
improve call number sorting

oils_text_as_bytea now does uppercasing in addition
to converting strings to bytea, working around
the limitation that json_query can't stack transforms

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@18438 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agofix record result page in opac so that lack of an rt parameter works correctly
phasefx [Wed, 20 Oct 2010 15:24:51 +0000 (15:24 +0000)]
fix record result page in opac so that lack of an rt parameter works correctly

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@18406 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agobackport r18355 and r18399 for better phone-derived password behavior
phasefx [Wed, 20 Oct 2010 14:47:32 +0000 (14:47 +0000)]
backport r18355 and r18399 for better phone-derived password behavior

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@18401 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agoBackport oils_text_as_bytea work from the 1.6 branch
miker [Sat, 16 Oct 2010 15:49:12 +0000 (15:49 +0000)]
Backport oils_text_as_bytea work from the 1.6 branch

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@18369 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agorestoring dbs' better ISSN extraction for r.old_super_simple_record
gmc [Sat, 16 Oct 2010 06:55:02 +0000 (06:55 +0000)]
restoring dbs' better ISSN extraction for r.old_super_simple_record

Had gottten lost in the shuffle in rel_1_6

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@18360 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agobackporting r17243 all the way down to reduce errors on upgrade
gmc [Sat, 16 Oct 2010 06:06:23 +0000 (06:06 +0000)]
backporting r17243 all the way down to reduce errors on upgrade

Signed-off-by: Galen Charlton <gmc@esilibrary.com>.
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@18358 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years ago"as" not "to" ... you pointed that out the first time, miker, what is your deal?
miker [Thu, 14 Oct 2010 20:06:23 +0000 (20:06 +0000)]
"as" not "to" ... you pointed that out the first time, miker, what is your deal?

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@18346 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agosort call numbers better regardless of database locale
gmc [Thu, 14 Oct 2010 19:42:49 +0000 (19:42 +0000)]
sort call numbers better regardless of database locale

rel_1_6 version of r18333, accounting for fact that 1.6.x does not
have label_sortkey

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@18340 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agoget ready for the new stuff
miker [Thu, 14 Oct 2010 19:40:25 +0000 (19:40 +0000)]
get ready for the new stuff

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@18339 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agofix Actions for this Record -> Add Volumes. backport was missing this
phasefx [Mon, 11 Oct 2010 18:14:04 +0000 (18:14 +0000)]
fix Actions for this Record -> Add Volumes.  backport was missing this

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@18268 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agomake sure we change the juvenile flag on the patron object when we automatically...
phasefx [Fri, 8 Oct 2010 15:47:27 +0000 (15:47 +0000)]
make sure we change the juvenile flag on the patron object when we automatically change the juvenile checkbox in the UI

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@18243 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agoAvoid scary SSL / HTTPS errors in Apache configuration
dbs [Fri, 8 Oct 2010 03:26:59 +0000 (03:26 +0000)]
Avoid scary SSL / HTTPS errors in Apache configuration

When port 443 is the last listener port, Apache generates lots
of "unknown protocol speaking not SSL to HTTPS port!?" errors in
the logs - which are scary, but harmless. Putting port 80 last
avoids those errors entirely, per http://wiki.apache.org/httpd/InternalDummyConnection

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@18236 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agoprevent repeat renderings of opac sidebar (relevant subjects, authors, etc.) in Firef...
phasefx [Mon, 4 Oct 2010 17:32:09 +0000 (17:32 +0000)]
prevent repeat renderings of opac sidebar (relevant subjects, authors, etc.) in Firefox.  What's happening is that the rresultHandleMods is not firing immediately with each record retrieve, and so we get a flurry at the end where resultPageIsDone() returns true for all of them, triggering the allRecordsReceived event more than once.  So now at the end of the first allRecordsReceived event chain, we set a global variable, and have these render functions check to see if it has been set.

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@18157 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agoBackporting mod_deflate config from trunk -- big speed win, yay!
miker [Fri, 1 Oct 2010 15:59:17 +0000 (15:59 +0000)]
Backporting mod_deflate config from trunk -- big speed win, yay!

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@18120 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agoimprove hold targetting
gmc [Fri, 24 Sep 2010 18:43:50 +0000 (18:43 +0000)]
improve hold targetting

* all potential capturable copies are now checked (up to the first
  one that is permitted for the request), instead of a small random
  subset of them
* don't do redundant permission checks

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@17968 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agomerge r17958 from trunk for patron display juvenile CSS
phasefx [Fri, 24 Sep 2010 18:06:49 +0000 (18:06 +0000)]
merge r17958 from trunk for patron display juvenile CSS

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@17961 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agoForward-port of a patch from Steve Callendar, via James Fournie, via launchpad:
miker [Thu, 23 Sep 2010 15:34:10 +0000 (15:34 +0000)]
Forward-port of a patch from Steve Callendar, via James Fournie, via launchpad:

When the patron.password.use_phone is set, new patrons are created with their password set to the last 4 digits of their phone number, HOWEVER, when a patron's password is reset, it does not work properly. Although the little underlined summary shows the proper 4 digits, the password box displays 9-ish digits, and is not the last 4 digits of the password.

The attached patch was created by Steve Callender and is confirmed working on 1.6.0

This patch will not work on 2.0 as that has a new user editor, but it would presumably be worthwhile to verify this functionality works in that editor as well.

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@17921 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agoBackport r17847 from Dan Scott: protect non-search, colon-delimited strings from...
miker [Mon, 20 Sep 2010 22:10:44 +0000 (22:10 +0000)]
Backport r17847 from Dan Scott: protect non-search, colon-delimited strings from breaking searches

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@17852 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agoUpdate version stamp for Evergreen service, adopting branch convention from trunk
dbs [Fri, 10 Sep 2010 14:48:58 +0000 (14:48 +0000)]
Update version stamp for Evergreen service, adopting branch convention from trunk

http://hostname/gateway?service=open-ils.actor&method=opensrf.open-ils.system.ils_version
was returning "1-5" for a number of systems we checked; in trunk, we have adopted the
"x-y" convention for branches, so in the 1.6 branches we will follow the "x-y-z"
approach for a little more clarity.

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@17569 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agoBackport just the bib-source setting portion of r17403
dbs [Mon, 6 Sep 2010 07:45:28 +0000 (07:45 +0000)]
Backport just the bib-source setting portion of r17403

When importing a set of records from Vandelay, the bib source selection widget
on the Vandelay screen should actually affect the biblio.record_entry.source
value of the imported records.

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@17493 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agofixes a bug when purging offline transactions after an Export
phasefx [Tue, 31 Aug 2010 17:14:44 +0000 (17:14 +0000)]
fixes a bug when purging offline transactions after an Export

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@17411 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agoBackport r17405: fix start/end date selection problem with reservations
senator [Tue, 31 Aug 2010 17:07:46 +0000 (17:07 +0000)]
Backport r17405: fix start/end date selection problem with reservations

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@17408 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agoBackport r17346 to fix broken OPAC renewals
senator [Thu, 26 Aug 2010 14:55:55 +0000 (14:55 +0000)]
Backport r17346 to fix broken OPAC renewals

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@17348 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years ago1-line fix for false 404 from sylvar
atz [Tue, 24 Aug 2010 15:44:10 +0000 (15:44 +0000)]
1-line fix for false 404 from sylvar

solves "The requested URL /xul/rel_1_6_0_7/server/patron/ue.xhtml&clone=112879 was not found on this server."

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@17326 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agobackport of r17299: we need an index on LOWER(barcode) with r17018
miker [Sat, 21 Aug 2010 18:07:45 +0000 (18:07 +0000)]
backport of r17299: we need an index on LOWER(barcode) with r17018

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@17301 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agoprovide an explicit import() sub to collect the boostrap config name at import. ...
erickson [Wed, 18 Aug 2010 17:41:22 +0000 (17:41 +0000)]
provide an explicit import() sub to collect the boostrap config name at import.  force child_init to run (once) if not run by Apache

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@17252 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agoBackport of 17243: so, some datasets have records with multiple 245a subfields. yeah...
miker [Wed, 18 Aug 2010 16:37:43 +0000 (16:37 +0000)]
Backport of 17243: so, some datasets have records with multiple 245a subfields. yeah, really.

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@17246 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agobackport of 17216, org hiding depth in opac
phasefx [Tue, 17 Aug 2010 19:55:02 +0000 (19:55 +0000)]
backport of 17216, org hiding depth in opac

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@17232 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agoGrant permissions related to booking/reservations to circulators and admins
dbs [Fri, 13 Aug 2010 19:11:38 +0000 (19:11 +0000)]
Grant permissions related to booking/reservations to circulators and admins

This should make for a better out-of-the-box experience for Evergreen adopters.
The permissions in the upgrade script are outside of the transaction to avoid
rolling back the entire upgrade if a site has already assigned these
permissions.

TODO: Document the new permissions as part of the 1.6.1 release notes so
that sites can alter the upgrade script according to their desires if they
don't like the defaults.

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@17219 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agoAnd get that closing brace back in place for the Dojo user editor
dbs [Thu, 12 Aug 2010 18:33:36 +0000 (18:33 +0000)]
And get that closing brace back in place for the Dojo user editor

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@17197 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agoShow the "Active?" checkbox as part of the required (minimal) set of fields
dbs [Thu, 12 Aug 2010 18:21:55 +0000 (18:21 +0000)]
Show the "Active?" checkbox as part of the required (minimal) set of fields

As we're registering users, it's probably a good idea to ensure that staff
can set the user to active at the same time that they enter the minimal
patron information.

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@17194 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agoEnable "Delete address" button to work in rel_1_6
dbs [Thu, 12 Aug 2010 17:50:32 +0000 (17:50 +0000)]
Enable "Delete address" button to work in rel_1_6

In some ways the inverse of r17023, the else clause that enabled
the delete button to be enabled was never being reached because
the preceding clauses caught all cases.

Moving it outside of the foreach() loop entirely seems to resolve the problem.

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@17191 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agoRemove broken old JavaScript in Google Book preview code
dbs [Thu, 12 Aug 2010 07:45:11 +0000 (07:45 +0000)]
Remove broken old JavaScript in Google Book preview code

I /think/ this was supposed to change the title of the "Preview" link to
"Read this online" or the like in the case that the full text is available,
but it was relying on a function that didn't exist (setText) and trying
to reference an ID that didn't exists. So it broke in those rare cases
where Google Books did provide the full text.

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@17183 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agoAdd schema upgrades for r16982, r16996, r17009, r17159 to 1.6.1.2
dbs [Wed, 11 Aug 2010 17:13:46 +0000 (17:13 +0000)]
Add schema upgrades for r16982, r16996, r17009, r17159 to 1.6.1.2

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@17173 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agobug 592777: allow authoritative version of open-ils.circ.retrieve
gmc [Tue, 10 Aug 2010 21:22:22 +0000 (21:22 +0000)]
bug 592777: allow authoritative version of open-ils.circ.retrieve

Part of a fix to avoid race condition that can occur
when patron renews an item in the OPAC in a database
that uses pgpool and replication, which sometimes
results in an erroneous 'action_circulation_not_found' error.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@17163 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agoremove extra DB upgrade script
gmc [Tue, 10 Aug 2010 18:29:26 +0000 (18:29 +0000)]
remove extra DB upgrade script

Thought better of including it in the backport to rel_1_6_1.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@17157 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agofix age protection proximity test for in-DB circ
gmc [Tue, 10 Aug 2010 18:26:51 +0000 (18:26 +0000)]
fix age protection proximity test for in-DB circ

Patch from John Craig.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@17154 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agoPatch from Ben Ostrowsky <ben@esilibrary.com> to specify "staff account" in proxied...
dbs [Mon, 9 Aug 2010 13:15:26 +0000 (13:15 +0000)]
Patch from Ben Ostrowsky <ben@esilibrary.com> to specify "staff account" in proxied pages

This change will make it a bit more clear that we're not looking for a
patron barcode/PIN in the Selfcheck Login screen (and make the wording
consistent across similar login pages).

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@17133 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agobug 532217: work around caching issue resulting doubled title display
gmc [Fri, 6 Aug 2010 20:38:07 +0000 (20:38 +0000)]
bug 532217: work around caching issue resulting doubled title display

Quick hack shamelessly borrowed from Dan Scott to fix problem
of title being displayed twice on bib details page when back
button is used in OPAC or staff client.

This is a temporary fix in lieu of rewriting the bib details
display to use BibTemplate exclusively.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@17125 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agobug 614150: bail out on ACTOR_USER_NOT_FOUND
gmc [Fri, 6 Aug 2010 01:22:39 +0000 (01:22 +0000)]
bug 614150: bail out on ACTOR_USER_NOT_FOUND

This fixes a bug where uploading an offline checkout
that refers to a missing patron returns an INTERNAL_SERVER_ERROR
instead of ACTOR_USER_NOT_FOUND.  More generally, this avoids
an exception in case case where a circ operation is made
without checking the existence of the patron record beforehand.

mk_env could use a better name, too.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@17115 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agobug 614132: fix glitch when used cached permission group widget
gmc [Fri, 6 Aug 2010 00:56:26 +0000 (00:56 +0000)]
bug 614132: fix glitch when used cached permission group widget

Fixes bug where the initial permission group value in a circ or
hold matrix entry was not displayed when editing an
existing matchpoint.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@17111 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agobug 613703: normalize backdate on item checkin better
gmc [Thu, 5 Aug 2010 03:01:50 +0000 (03:01 +0000)]
bug 613703: normalize backdate on item checkin better

Fixes bug that appears to cause all checkins uploaded
via offline circ to fail with an "invalid date format"
error.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@17087 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agoForward-port r17024: include null fields, via .toStoreItem(), when creating a permiss...
miker [Fri, 23 Jul 2010 17:20:56 +0000 (17:20 +0000)]
Forward-port r17024: include null fields, via .toStoreItem(), when creating a permission map store item

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@17026 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agobug #608937: make barcode search from main patron search form case-insensitive
gmc [Thu, 22 Jul 2010 21:47:48 +0000 (21:47 +0000)]
bug #608937: make barcode search from main patron search form case-insensitive

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@17019 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agobackport of r17007: retain the indicators on located uri 856 merge during asset merge
miker [Thu, 22 Jul 2010 01:05:58 +0000 (01:05 +0000)]
backport of r17007: retain the indicators on located uri 856 merge during asset merge

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@17010 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agoindex which /greatly/ speeds collection of pending active events
miker [Wed, 21 Jul 2010 15:38:45 +0000 (15:38 +0000)]
index which /greatly/ speeds collection of pending active events

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@16997 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agoBackport of r16987: Patch from John Craig providing a saner timestamp cleansing setup...
miker [Tue, 20 Jul 2010 19:58:27 +0000 (19:58 +0000)]
Backport of r16987: Patch from John Craig providing a saner timestamp cleansing setup for backdated circs, 1.6 edition

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@16988 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agobackporting r16982: use the correct table and field, caught by Doug Kyle and reported...
miker [Tue, 20 Jul 2010 15:54:00 +0000 (15:54 +0000)]
backporting r16982: use the correct table and field, caught by Doug Kyle and reported via IRC

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@16984 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agoreplace line lost during conflict resolution
erickson [Fri, 16 Jul 2010 14:18:30 +0000 (14:18 +0000)]
replace line lost during conflict resolution

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@16960 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agoback-porting action trigger fixes 16956 and 16953
erickson [Fri, 16 Jul 2010 14:12:44 +0000 (14:12 +0000)]
back-porting action trigger fixes 16956 and 16953

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@16958 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agoBackport the submit button from trunk. It's hard to submit a form without this.
dbs [Tue, 13 Jul 2010 19:27:19 +0000 (19:27 +0000)]
Backport the submit button from trunk. It's hard to submit a form without this.

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@16921 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agoPatch from James Fournie to address backdating timestamp format error
miker [Fri, 9 Jul 2010 16:41:32 +0000 (16:41 +0000)]
Patch from James Fournie to address backdating timestamp format error

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@16902 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agoGet the 1.6.0.4-1.6.0.5 updates into the rel_1_6/rel_1_6_0 stream
dbs [Thu, 8 Jul 2010 20:12:46 +0000 (20:12 +0000)]
Get the 1.6.0.4-1.6.0.5 updates into the rel_1_6/rel_1_6_0 stream

This may end up in someone who has followed the entire 1.6.0.x
upgrade train applying these two updates twice, but it shouldn't
hurt - and ensures that someone who jumped to 1.6.1.0 or 1.6.1.1
gets these important updates.

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@16893 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agoGive the "About" button a legitimate accesskey
dbs [Thu, 8 Jul 2010 18:36:26 +0000 (18:36 +0000)]
Give the "About" button a legitimate accesskey

r15562 contained a fix for this to rel_1_6_0, but apparently I never
forward-ported that "fix". Unfortunately, this leads to broken interfaces in
the i18n build (bug re-found by Robert Souilliere in the 1.6.1.1 release).

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@16890 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agoForward port of r16867: add missing event definition required by vandelay authority...
miker [Wed, 7 Jul 2010 17:13:21 +0000 (17:13 +0000)]
Forward port of r16867: add missing event definition required by vandelay authority import

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@16869 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agobackport r16838 from trunk
gmc [Thu, 1 Jul 2010 02:29:21 +0000 (02:29 +0000)]
backport r16838 from trunk

bug #600021: fix lookup of FIFO holds OU setting

Patch from Anoop Atre that fixes enabling FIFO
holds via the circ.holds_fifo org unit setting.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@16841 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agoPatch from Don McMorris. Good catch, Don.
senator [Mon, 28 Jun 2010 21:35:59 +0000 (21:35 +0000)]
Patch from Don McMorris. Good catch, Don.

He writes:

    In the branch rel_1_6 version of 950.data.seed-values.sql [1], lines
    138-142 create the OU setting
    'circ.booking_reservation.default_elbow_room' via the query:

    INSERT INTO actor.org_unit_setting (org_unit, name, value) VALUES (
               (SELECT id FROM actor.org_unit WHERE parent_ou IS NULL),
               'circ.booking_reservation.default_elbow_room',
               '"1 day"'
           );

    However, it appears that actor.org_unit does not start to get
    populated until line 853.  As such, the "SELECT id FROM actor.org_unit
    WHERE parent_ou IS NULL" portion of the insert will return NULL, and
    actor.org_unit_setting.org_unit has a 'NOT NULL' contraint - as such,
    the insert fails.

    [...]

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@16826 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agoremove attempts to install staging and query schemas in 1.6.x
miker [Tue, 22 Jun 2010 22:00:11 +0000 (22:00 +0000)]
remove attempts to install staging and query schemas in 1.6.x

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@16783 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agoBackport security fix r16747 from trunk
miker [Fri, 18 Jun 2010 19:42:40 +0000 (19:42 +0000)]
Backport security fix r16747 from trunk

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@16766 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agoI18N fixes: Merge r16707, r16708, r16709, r16712 from rel_1_6
dbs [Mon, 14 Jun 2010 17:05:50 +0000 (17:05 +0000)]
I18N fixes: Merge r16707, r16708, r16709, r16712 from rel_1_6

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@16715 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agoremoved unused method retrieved from method_lookup. apart from being unused, the...
erickson [Mon, 14 Jun 2010 16:14:23 +0000 (16:14 +0000)]
removed unused method retrieved from method_lookup.  apart from being unused, the call was attempting to fetch a nonexistent method ('auth' vs. 'authority') and hilarity ensued

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@16710 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agoBranching 1.6.1.x
miker [Mon, 14 Jun 2010 14:49:16 +0000 (14:49 +0000)]
Branching 1.6.1.x

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_1@16701 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agodb upgrade script comment and license
miker [Mon, 14 Jun 2010 14:48:37 +0000 (14:48 +0000)]
db upgrade script comment and license

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@16700 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agobackporting r16694 -- reporter WHERE clause fixes
miker [Sat, 12 Jun 2010 13:50:45 +0000 (13:50 +0000)]
backporting r16694 -- reporter WHERE clause fixes

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@16695 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agoRepair abuse of dojo translatable string bundle for Booking.
senator [Fri, 11 Jun 2010 21:36:42 +0000 (21:36 +0000)]
Repair abuse of dojo translatable string bundle for Booking.
These should be JSON only, no code.

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@16692 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agoa null boolean value should use the label for UNSET instead of False (the default)
erickson [Fri, 11 Jun 2010 21:20:46 +0000 (21:20 +0000)]
a null boolean value should use the label for UNSET instead of False (the default)

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@16691 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agobackporting changeset 16687 with harmless bits of 14391 and 15222 sneaking in; hoping...
phasefx [Fri, 11 Jun 2010 21:16:33 +0000 (21:16 +0000)]
backporting changeset 16687 with harmless bits of 14391 and 15222 sneaking in; hoping to help with https://bugs.launchpad.net/evergreen/+bug/567505

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@16688 dcc99617-32d9-48b4-a31d-7c20da2025e4

13 years agoadded a number of info messages to the action/trigger runner and server code. the...
erickson [Fri, 11 Jun 2010 13:50:24 +0000 (13:50 +0000)]
added a number of info messages to the action/trigger runner and server code.  the messages provide summary data about what event defs / hooks are being processed and when/if they complete or timeout.

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@16676 dcc99617-32d9-48b4-a31d-7c20da2025e4