miker [Mon, 1 Nov 2010 18:38:34 +0000 (18:38 +0000)]
we should not restrict to the top org only, get all counts
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18556
dcc99617-32d9-48b4-a31d-
7c20da2025e4
miker [Mon, 1 Nov 2010 18:27:14 +0000 (18:27 +0000)]
Backport thinko fix for count reporting
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18554
dcc99617-32d9-48b4-a31d-
7c20da2025e4
miker [Mon, 1 Nov 2010 17:31:22 +0000 (17:31 +0000)]
Backport of in-db hold permit improvements from trunk
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18551
dcc99617-32d9-48b4-a31d-
7c20da2025e4
phasefx [Mon, 1 Nov 2010 16:23:22 +0000 (16:23 +0000)]
syntax
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18547
dcc99617-32d9-48b4-a31d-
7c20da2025e4
miker [Mon, 1 Nov 2010 16:18:23 +0000 (16:18 +0000)]
Include copy counts in holdings XML -- I will destroy MVRs yet!
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18546
dcc99617-32d9-48b4-a31d-
7c20da2025e4
gmc [Mon, 1 Nov 2010 15:40:57 +0000 (15:40 +0000)]
let libraries allow funds to be overcommitted
The check constraints on the balance warning and
stop limits were too strict - a library can validly
choose to permit a fund to have a commitment greater
than 100% of its allocation
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18544
dcc99617-32d9-48b4-a31d-
7c20da2025e4
gmc [Fri, 29 Oct 2010 01:25:41 +0000 (01:25 +0000)]
adjust quoting of phrase searches
This has three main effects:
* This formalizes the current behavior where a
phrase search like
title:"^Harry Potter"
acts as a left-anchored search and
title:"Harry Potter$"
acts as a right-anchored search.
In particular, this can be useful for constructing
searches of bibliographic call numbers.
* Other regex metacharacters in phrase searches are
now escaped.
* Phrase searches like "C++" will no longer crash; in fact,
this makes a phrase search currently the only way to
accurately retrieve all C++ titles with the usual
normalization rules
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18541
dcc99617-32d9-48b4-a31d-
7c20da2025e4
gmc [Fri, 29 Oct 2010 00:06:26 +0000 (00:06 +0000)]
loosen cross-check of line item ID when processing incoming EDI messages
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18539
dcc99617-32d9-48b4-a31d-
7c20da2025e4
gmc [Thu, 28 Oct 2010 23:56:06 +0000 (23:56 +0000)]
wrap some EDI message retrievals in transactions
Avoid errors when operating under Slony.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18537
dcc99617-32d9-48b4-a31d-
7c20da2025e4
erickson [Thu, 28 Oct 2010 20:06:14 +0000 (20:06 +0000)]
calling noop with no arguments (and not capturing the output) is, well, a no-op. set the value to true as originally intended
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18533
dcc99617-32d9-48b4-a31d-
7c20da2025e4
senator [Thu, 28 Oct 2010 18:20:29 +0000 (18:20 +0000)]
Backport r18530 from trunk: misc alt serials UI minor improvements, tweaks
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18531
dcc99617-32d9-48b4-a31d-
7c20da2025e4
phasefx [Thu, 28 Oct 2010 17:26:38 +0000 (17:26 +0000)]
backport r18498-18499 from trunk for staff-initiated age overdue circ/item to Lost functionality, with upgrade script
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18527
dcc99617-32d9-48b4-a31d-
7c20da2025e4
erickson [Thu, 28 Oct 2010 15:14:00 +0000 (15:14 +0000)]
condensed SIP patron lookup by barcode into 1 cstore call; provided option for slimmed-down user object fetching in the case of checkin, where all we really need is the barcode of the user on the circulation
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18520
dcc99617-32d9-48b4-a31d-
7c20da2025e4
dbs [Thu, 28 Oct 2010 15:10:53 +0000 (15:10 +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.
For sortkey-aware branches, I modified James' patch to take advantage of the
asset.call_number.label_sortkey column and the oils_text_as_bytea() function.
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18518
dcc99617-32d9-48b4-a31d-
7c20da2025e4
senator [Wed, 27 Oct 2010 21:21:30 +0000 (21:21 +0000)]
Backport r18514 from trunk, more circ speedups when booking not in play
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18515
dcc99617-32d9-48b4-a31d-
7c20da2025e4
erickson [Wed, 27 Oct 2010 20:21:16 +0000 (20:21 +0000)]
more micro-optimization of checkin code; protect against undef var warning in info message; removed unused sub
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18512
dcc99617-32d9-48b4-a31d-
7c20da2025e4
miker [Wed, 27 Oct 2010 20:08:52 +0000 (20:08 +0000)]
Move towards unnest (faster than explode_array); bring upgrade script up to speed
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18509
dcc99617-32d9-48b4-a31d-
7c20da2025e4
erickson [Wed, 27 Oct 2010 19:19:26 +0000 (19:19 +0000)]
since they typically repeat, cache the org and requestor objects in the permit loop of the find-best-hold calculation
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18506
dcc99617-32d9-48b4-a31d-
7c20da2025e4
miker [Wed, 27 Oct 2010 19:13:54 +0000 (19:13 +0000)]
Backport of r18494, r18500 and r18501 from trunk: split fine generation
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18504
dcc99617-32d9-48b4-a31d-
7c20da2025e4
senator [Wed, 27 Oct 2010 19:09:14 +0000 (19:09 +0000)]
Backport r18502 from trunk: make booking avoidable in circ service (speedup!)
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18503
dcc99617-32d9-48b4-a31d-
7c20da2025e4
gmc [Wed, 27 Oct 2010 16:57:05 +0000 (16:57 +0000)]
remove unused settings and permission
circ.holds.alert_if_local_avail and circ.holds.deny_if_local_avail
are redundant; circ.holds.hold_has_copy_at.{alert|block} are the
settings that will actually be used. Also remove a related,
redundant permission.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18496
dcc99617-32d9-48b4-a31d-
7c20da2025e4
erickson [Wed, 27 Oct 2010 15:26:50 +0000 (15:26 +0000)]
added grid autoHeight to distrib formula page to prevent the grid from consuming the whole page
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18492
dcc99617-32d9-48b4-a31d-
7c20da2025e4
senator [Wed, 27 Oct 2010 14:53:29 +0000 (14:53 +0000)]
Backport r18489 from trunk: distribution formula UI paging
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18490
dcc99617-32d9-48b4-a31d-
7c20da2025e4
gmc [Wed, 27 Oct 2010 13:51:55 +0000 (13:51 +0000)]
fix glitch in escaping call number labels
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18488
dcc99617-32d9-48b4-a31d-
7c20da2025e4
phasefx [Wed, 27 Oct 2010 05:11:14 +0000 (05:11 +0000)]
View Source option for embedded browser (click on the Debug link)
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18486
dcc99617-32d9-48b4-a31d-
7c20da2025e4
senator [Tue, 26 Oct 2010 22:11:57 +0000 (22:11 +0000)]
Backport r18480 from trunk: copy template editor bugfix
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18481
dcc99617-32d9-48b4-a31d-
7c20da2025e4
gmc [Tue, 26 Oct 2010 19:36:35 +0000 (19:36 +0000)]
fix NACO normalization of four letter modifier characters
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18477
dcc99617-32d9-48b4-a31d-
7c20da2025e4
miker [Tue, 26 Oct 2010 14:00:09 +0000 (14:00 +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_2_0@18470
dcc99617-32d9-48b4-a31d-
7c20da2025e4
phasefx [Mon, 25 Oct 2010 19:16:20 +0000 (19:16 +0000)]
Floating field in alternate item details UI
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18468
dcc99617-32d9-48b4-a31d-
7c20da2025e4
miker [Mon, 25 Oct 2010 18:31:58 +0000 (18:31 +0000)]
quickly, before anyone notices ... minor speed enhancement (aka, thinko)
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18466
dcc99617-32d9-48b4-a31d-
7c20da2025e4
miker [Mon, 25 Oct 2010 18:23:44 +0000 (18:23 +0000)]
Backport r18462-r18463 from trunk: Remove some connectby() uses and update upgrade script
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18464
dcc99617-32d9-48b4-a31d-
7c20da2025e4
miker [Mon, 25 Oct 2010 16:25:36 +0000 (16:25 +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_2_0@18458
dcc99617-32d9-48b4-a31d-
7c20da2025e4
erickson [Fri, 22 Oct 2010 20:41:09 +0000 (20:41 +0000)]
further protection against dreaded opac bank page; wrap settimeout redetail bibtemplate loading in an onload to ensure it runs after dojo onload events
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18455
dcc99617-32d9-48b4-a31d-
7c20da2025e4
miker [Fri, 22 Oct 2010 19:27:21 +0000 (19:27 +0000)]
Use standard JS syntax; var [...] seems to be a Spidermonkey extension
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18453
dcc99617-32d9-48b4-a31d-
7c20da2025e4
miker [Fri, 22 Oct 2010 16:25:25 +0000 (16:25 +0000)]
typo in setTimeout spotted by dbs
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18451
dcc99617-32d9-48b4-a31d-
7c20da2025e4
senator [Fri, 22 Oct 2010 16:24:39 +0000 (16:24 +0000)]
Backport r18448 from trunk, minor acq glitch with view/place orders interface
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18449
dcc99617-32d9-48b4-a31d-
7c20da2025e4
miker [Fri, 22 Oct 2010 16:21:07 +0000 (16:21 +0000)]
Move dojo loading around to avoid the "white screen of death" in Firefox and xulrunner (See: o.dojotoolkit.org/forum/dojo-foundation/general-discussion/firefox-3-fires-domcontentloaded-event-prematurely )
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18447
dcc99617-32d9-48b4-a31d-
7c20da2025e4
senator [Thu, 21 Oct 2010 19:33:46 +0000 (19:33 +0000)]
Backport r18442 from trunk, autogrid cut-off tweak
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18443
dcc99617-32d9-48b4-a31d-
7c20da2025e4
phasefx [Thu, 21 Oct 2010 16:12:31 +0000 (16:12 +0000)]
ilsevent is no longer a number, but a string. I knew that, but missed this test
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18441
dcc99617-32d9-48b4-a31d-
7c20da2025e4
gmc [Thu, 21 Oct 2010 14:48:12 +0000 (14:48 +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_2_0@18436
dcc99617-32d9-48b4-a31d-
7c20da2025e4
gmc [Wed, 20 Oct 2010 21:48:31 +0000 (21:48 +0000)]
use a transaction when searching for the nearest hold request
Solves the following problem in a setup that uses Slony - if
multiple items that can fulfill the same hold are checked
in one after another, occassionally two items will end up
being put in transit for the same hold request.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18433
dcc99617-32d9-48b4-a31d-
7c20da2025e4
erickson [Wed, 20 Oct 2010 20:45:32 +0000 (20:45 +0000)]
added some time diagnostics to checkin process; more org unit caching; do less user fleshing on hold user during checkin (only card and name is needed)
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18430
dcc99617-32d9-48b4-a31d-
7c20da2025e4
miker [Wed, 20 Oct 2010 20:45:03 +0000 (20:45 +0000)]
These fields exist ... tell the IDL about them
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18429
dcc99617-32d9-48b4-a31d-
7c20da2025e4
miker [Wed, 20 Oct 2010 20:34:11 +0000 (20:34 +0000)]
add start_date and end_date to scap serialization
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18426
dcc99617-32d9-48b4-a31d-
7c20da2025e4
phasefx [Wed, 20 Oct 2010 20:15:33 +0000 (20:15 +0000)]
don't allow inactive cards with web-selfcheck
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18424
dcc99617-32d9-48b4-a31d-
7c20da2025e4
senator [Wed, 20 Oct 2010 20:14:44 +0000 (20:14 +0000)]
Backport r18421 from trunk
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18422
dcc99617-32d9-48b4-a31d-
7c20da2025e4
senator [Wed, 20 Oct 2010 19:52:20 +0000 (19:52 +0000)]
Backport r18419 from trunk: supercat bugs on records with serials data attached
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18420
dcc99617-32d9-48b4-a31d-
7c20da2025e4
miker [Wed, 20 Oct 2010 19:49:16 +0000 (19:49 +0000)]
Patch from tsbere to address backporting issue of hard due dates patch against trunk (also, get rid of 3-space indentation..)
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18418
dcc99617-32d9-48b4-a31d-
7c20da2025e4
senator [Wed, 20 Oct 2010 19:36:34 +0000 (19:36 +0000)]
Backport r18416 from trunk: a/t use rstore to flesh if cstore not available
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18417
dcc99617-32d9-48b4-a31d-
7c20da2025e4
senator [Wed, 20 Oct 2010 17:33:51 +0000 (17:33 +0000)]
Backport r18414 from trunk
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18415
dcc99617-32d9-48b4-a31d-
7c20da2025e4
miker [Wed, 20 Oct 2010 16:40:14 +0000 (16:40 +0000)]
1.6.1-2.0 upgrade script needs to fall in line with reality, re 0442
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18412
dcc99617-32d9-48b4-a31d-
7c20da2025e4
dbs [Wed, 20 Oct 2010 16:20:43 +0000 (16:20 +0000)]
Prevent "Validate" from matching against deleted authority records
2.0 introduces the ability to delete authority records. The routines in
OpenILS:Application:Storage:Publisher:authority check for matching values
of authority.full_rec without concern about whether the corresponding
entry in authority.record_entry has been deleted or not.
This change removes entries from authority.full_rec when an
authority.record_entry row is deleted, with the (possibly incorrect)
assumption that there won't be many cases where users will want to
search for deleted authority records and undelete them. If that
assumption turns out to be incorrect, then further changes can follow;
this change at least makes the current behaviour for user-visible
actions work as expected.
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18410
dcc99617-32d9-48b4-a31d-
7c20da2025e4
senator [Wed, 20 Oct 2010 16:00:28 +0000 (16:00 +0000)]
Backport r18407 from trunk: alt serials interface tweak
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18408
dcc99617-32d9-48b4-a31d-
7c20da2025e4
erickson [Wed, 20 Oct 2010 15:24:08 +0000 (15:24 +0000)]
during checkin, an item's hold may have a fleshed pickup_lib. added code to detect and protect against treating a ref as an ID. minor cleanup
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18403
dcc99617-32d9-48b4-a31d-
7c20da2025e4
miker [Wed, 20 Oct 2010 13:26:37 +0000 (13:26 +0000)]
Backporting r18396 from trunk: Patch from Thomas Berezansky providing an alternate implementation of Hard Due Dates
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18397
dcc99617-32d9-48b4-a31d-
7c20da2025e4
miker [Tue, 19 Oct 2010 20:37:34 +0000 (20:37 +0000)]
expand the scope of BT on the result list page, allowing simpler slots
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18393
dcc99617-32d9-48b4-a31d-
7c20da2025e4
gmc [Mon, 18 Oct 2010 23:02:43 +0000 (23:02 +0000)]
update 1.6.1 to 2.0 upgrade script for 0441
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18391
dcc99617-32d9-48b4-a31d-
7c20da2025e4
gmc [Mon, 18 Oct 2010 23:00:23 +0000 (23:00 +0000)]
fix mapping of the crossed D character in naco_normalize
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18389
dcc99617-32d9-48b4-a31d-
7c20da2025e4
senator [Mon, 18 Oct 2010 21:54:18 +0000 (21:54 +0000)]
Backport r18386 from trunk, asset.copy_template editing improvement
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18387
dcc99617-32d9-48b4-a31d-
7c20da2025e4
senator [Mon, 18 Oct 2010 19:47:06 +0000 (19:47 +0000)]
Backport r18384 from trunk: serials previous issue copy location moving
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18385
dcc99617-32d9-48b4-a31d-
7c20da2025e4
dbs [Mon, 18 Oct 2010 19:10:13 +0000 (19:10 +0000)]
Protect biblio.extract_located_uris() from a NULL uri_use value by using the href as a fallback
If an 856 field contained a subfield "9" but did not contain a subfield
"z", "2", or "n", then ingest of the MARC record would fail as it attempted
to retrieve an asset.uri row where uri_use = NULL - which was never true.
This change adds the subfield "u" to fall back to for the uri_use variable,
just like we do for the uri_label variable, and prevents ugly ingest errors
from getting thrown back at the client.
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18383
dcc99617-32d9-48b4-a31d-
7c20da2025e4
phasefx [Mon, 18 Oct 2010 17:45:19 +0000 (17:45 +0000)]
stop sign page was incorrectly coming up for all penalties
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18381
dcc99617-32d9-48b4-a31d-
7c20da2025e4
phasefx [Mon, 18 Oct 2010 16:19:08 +0000 (16:19 +0000)]
make Circulation -> Enter Offline Interface open a new window instead of a tab, like the button from the login window. This works around a permission issue with loading the offline receipt templates
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18378
dcc99617-32d9-48b4-a31d-
7c20da2025e4
phasefx [Mon, 18 Oct 2010 15:37:23 +0000 (15:37 +0000)]
merge r18374-18375 from trunk for bill receipt fixes
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18376
dcc99617-32d9-48b4-a31d-
7c20da2025e4
miker [Sat, 16 Oct 2010 15:39:20 +0000 (15:39 +0000)]
Backporting r18364-r18366 from trunk: use a function to wrap up escaping of solidus and casting to bytea, propogate to indexing and where/order_by
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18367
dcc99617-32d9-48b4-a31d-
7c20da2025e4
miker [Fri, 15 Oct 2010 17:32:40 +0000 (17:32 +0000)]
Poked by scottmk to incorporate 0438 into the 1.6.1-2.0 upgrade script. This may duplicate effort if one is already on 1.6.1.3+ (when it exists) but there is no harm in it either.
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18356
dcc99617-32d9-48b4-a31d-
7c20da2025e4
gmc [Fri, 15 Oct 2010 13:10:13 +0000 (13:10 +0000)]
tweak expanding search field aliases
Avoids a glitch that can occur if a search field alias
exists that happens to have the same name as a search field.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18354
dcc99617-32d9-48b4-a31d-
7c20da2025e4
erickson [Thu, 14 Oct 2010 22:17:50 +0000 (22:17 +0000)]
If an item is captured for a hold, but not in transit (i.e. on holds shelf), set the destination_location equal to the pickup library (i.e where it's supposedly on the shelf). This is useful for autmated sorting so that the item will return to the branch whose shelf where it belongs.
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18352
dcc99617-32d9-48b4-a31d-
7c20da2025e4
erickson [Thu, 14 Oct 2010 20:48:58 +0000 (20:48 +0000)]
Back-porting a number of action/trigger fixes from trunk:
parallel collection and reaction with multisession
cut down xact begin/rollbacks to reduce call overhead during collection
force granularity-only when running w/ --granularity
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18350
dcc99617-32d9-48b4-a31d-
7c20da2025e4
miker [Thu, 14 Oct 2010 20:07:32 +0000 (20:07 +0000)]
upgrade version number fix
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18348
dcc99617-32d9-48b4-a31d-
7c20da2025e4
miker [Thu, 14 Oct 2010 20:04:47 +0000 (20:04 +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_2_0@18344
dcc99617-32d9-48b4-a31d-
7c20da2025e4
miker [Thu, 14 Oct 2010 19:34:07 +0000 (19:34 +0000)]
backward compat indexing for label instead of label_sortkey
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18337
dcc99617-32d9-48b4-a31d-
7c20da2025e4
miker [Thu, 14 Oct 2010 19:18:58 +0000 (19:18 +0000)]
cast label_sortkey to bytea in order to get ascii-betical sorting in any locale, even C. stupid glibc ...
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18334
dcc99617-32d9-48b4-a31d-
7c20da2025e4
miker [Thu, 14 Oct 2010 18:35:54 +0000 (18:35 +0000)]
patch from Steve Callendar to avoid resetting the passwd every time a phone number changes
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18332
dcc99617-32d9-48b4-a31d-
7c20da2025e4
miker [Thu, 14 Oct 2010 18:13:49 +0000 (18:13 +0000)]
correct top-half ordering by label_sortkey
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18330
dcc99617-32d9-48b4-a31d-
7c20da2025e4
phasefx [Thu, 14 Oct 2010 15:31:37 +0000 (15:31 +0000)]
change the Swap Editor button to a persisted checkbox
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18327
dcc99617-32d9-48b4-a31d-
7c20da2025e4
scottmk [Wed, 13 Oct 2010 21:12:12 +0000 (21:12 +0000)]
Change the treatment of ORDER BY. Except as noted, these changes
apply only to methods other than json_query.
1. Allow the use of array syntax for specifying an ORDER BY clause
as an array of field specifications, such as can be used in json_query.
The older syntax, using a hash based on class name, is still
available.
2. For json_query, using the array syntax: relax the requirement that a
class be in scope. A field from an out-of-scope class will now be
silently ignored. This change avoids certain problems with fleshing
queries, which use the same order_by array at multiple levels.
3. For the hash syntax: relax the requirement that the class be
referenced in the SELECT clause. Now it suffices that it be in
scope in the generated SQL. As a result, you can now sort by a
column in a joined class without artificially including that column
in the SELECT list.
4. When all or part of an ORDER BY clause is expressed as a string
literal: require that the string not contain any semicolons, in order
to block certain kinds of SQL injection. This measure could create
problems if a semicolon appears within a quoted string -- which is
possible in theory but highly improbable in practice.
5. Don't include a virtual field in an ORDER BY clause. If one is
specified, silently ignore it.
M Open-ILS/src/c-apps/oils_sql.c
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18325
dcc99617-32d9-48b4-a31d-
7c20da2025e4
erickson [Wed, 13 Oct 2010 20:18:23 +0000 (20:18 +0000)]
clean up duplicate system-controlled penalties during penalty calculation; perform penalty trigger event creation after the standalone commit occurs. todo, handle non-standalone post-commit penalty trigger event creation
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18324
dcc99617-32d9-48b4-a31d-
7c20da2025e4
miker [Wed, 13 Oct 2010 02:35:01 +0000 (02:35 +0000)]
thinko supporting multiple rules of the same type in in-line merge rulesets
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18304
dcc99617-32d9-48b4-a31d-
7c20da2025e4
miker [Tue, 12 Oct 2010 17:43:14 +0000 (17:43 +0000)]
Backporting MARC js fixes from trunk
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18284
dcc99617-32d9-48b4-a31d-
7c20da2025e4
atz [Tue, 12 Oct 2010 17:02:35 +0000 (17:02 +0000)]
Be sure to copy new JS files from OpenSRF on a FULL update/install
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18283
dcc99617-32d9-48b4-a31d-
7c20da2025e4
scottmk [Tue, 12 Oct 2010 13:40:13 +0000 (13:40 +0000)]
Incorporate upgrade # 0433 into the consolidated upgrade script.
M Open-ILS/src/sql/Pg/1.6.1-2.0-upgrade-db.sql
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18276
dcc99617-32d9-48b4-a31d-
7c20da2025e4
phasefx [Mon, 11 Oct 2010 21:43:26 +0000 (21:43 +0000)]
avoid race condition with post-save patron editor refresh and replicated databases
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18275
dcc99617-32d9-48b4-a31d-
7c20da2025e4
phasefx [Mon, 11 Oct 2010 20:40:04 +0000 (20:40 +0000)]
initialize these lists just once to prevent display glitch
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18270
dcc99617-32d9-48b4-a31d-
7c20da2025e4
atz [Mon, 11 Oct 2010 16:07:44 +0000 (16:07 +0000)]
Tighter verbose format for skipped POs
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18263
dcc99617-32d9-48b4-a31d-
7c20da2025e4
erickson [Mon, 11 Oct 2010 14:02:20 +0000 (14:02 +0000)]
wait to run-pending if a specific granularity used
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18257
dcc99617-32d9-48b4-a31d-
7c20da2025e4
erickson [Fri, 8 Oct 2010 21:11:23 +0000 (21:11 +0000)]
mild fixes for a/t interface admin interface. sort by def name instead of hook, which probably makes more sense to a human. hide the opt-in and max-delay columns to free up some badly needed horizontal space. use percentage width for name column, which acts a lot like 'auto', but allows the user to manually resize
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18254
dcc99617-32d9-48b4-a31d-
7c20da2025e4
phasefx [Fri, 8 Oct 2010 20:59:01 +0000 (20:59 +0000)]
typo
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18252
dcc99617-32d9-48b4-a31d-
7c20da2025e4
senator [Fri, 8 Oct 2010 18:03:11 +0000 (18:03 +0000)]
Backport r18249 from trunk: clear hold shelf work even on brokenish holds
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18250
dcc99617-32d9-48b4-a31d-
7c20da2025e4
phasefx [Fri, 8 Oct 2010 17:38:54 +0000 (17:38 +0000)]
fix logic error where we were just testing for the presence of a user setting instead of its value
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18248
dcc99617-32d9-48b4-a31d-
7c20da2025e4
phasefx [Fri, 8 Oct 2010 17:29:52 +0000 (17:29 +0000)]
moving users in and out of groups produced dialogs that expected vertical patron summaries. this fixes that
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18246
dcc99617-32d9-48b4-a31d-
7c20da2025e4
dbs [Fri, 8 Oct 2010 03:29:30 +0000 (03:29 +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_2_0@18238
dcc99617-32d9-48b4-a31d-
7c20da2025e4
gmc [Fri, 8 Oct 2010 01:35:25 +0000 (01:35 +0000)]
do not apply superpage limit inside bib search joins
Oddly, empirical evidence suggests that this might actually
be faster, and if this pans out, search results will definitely
be more complete.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18234
dcc99617-32d9-48b4-a31d-
7c20da2025e4
senator [Thu, 7 Oct 2010 22:48:12 +0000 (22:48 +0000)]
Backport r18230 and 18231, hold shelf clearer/printer
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18232
dcc99617-32d9-48b4-a31d-
7c20da2025e4
gmc [Thu, 7 Oct 2010 21:40:48 +0000 (21:40 +0000)]
choose the hold permit test variant correctly
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18229
dcc99617-32d9-48b4-a31d-
7c20da2025e4
senator [Thu, 7 Oct 2010 19:12:28 +0000 (19:12 +0000)]
Backport r18226 from trunk
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18227
dcc99617-32d9-48b4-a31d-
7c20da2025e4
atz [Thu, 7 Oct 2010 18:54:23 +0000 (18:54 +0000)]
EDI template update for ORDERS
This template produces JSON for the edi translator to convert into
actual EDI lines. It now handles vendor-specific requirements for
account and sub-account identification, and also transmits notes
of the vendor-public variety as FTX segments in the lineitem.
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18225
dcc99617-32d9-48b4-a31d-
7c20da2025e4
senator [Thu, 7 Oct 2010 17:19:45 +0000 (17:19 +0000)]
Backport r18222 from trunk: reasonable default sorting for expired holds list
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18223
dcc99617-32d9-48b4-a31d-
7c20da2025e4
phasefx [Thu, 7 Oct 2010 15:16:12 +0000 (15:16 +0000)]
merge r18220 from trunk for %destination_shelf% macro in hold and hold/transit slip templates
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18221
dcc99617-32d9-48b4-a31d-
7c20da2025e4
atz [Wed, 6 Oct 2010 22:13:20 +0000 (22:13 +0000)]
Warn but continue on skipped upgrade revs.
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@18218
dcc99617-32d9-48b4-a31d-
7c20da2025e4