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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
dbs [Fri, 11 Jun 2010 04:57:39 +0000 (04:57 +0000)]
Just like r16670, avoid directory creation error if directory exists
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@16672
dcc99617-32d9-48b4-a31d-
7c20da2025e4
dbs [Fri, 11 Jun 2010 04:47:29 +0000 (04:47 +0000)]
Add i18n Makefile support for new Dojo resource files in this release
reservation.js is still commented out until we bring it into compliance
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@16671
dcc99617-32d9-48b4-a31d-
7c20da2025e4
dbs [Fri, 11 Jun 2010 04:40:36 +0000 (04:40 +0000)]
Fix directory creation in Dojo resource script
Don't assume that if the file doesn't exist, that the directory also does not.
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@16670
dcc99617-32d9-48b4-a31d-
7c20da2025e4
dbs [Fri, 11 Jun 2010 03:40:15 +0000 (03:40 +0000)]
Backport r16667 from trunk: Remove extraneous whitespace in ILS events POT file
We were grabbing everything - tabs, newlines, extra spaces - from
ils_events.xml, and we don't want to do that.
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@16669
dcc99617-32d9-48b4-a31d-
7c20da2025e4
dbs [Fri, 11 Jun 2010 03:32:22 +0000 (03:32 +0000)]
Merge r16605 and r16607 from trunk for Dojo i18n enhancements:
* Create output directories if they do no exist (r16605)
* Identify problem file when generating POT from Dojo resource files (r16607)
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@16668
dcc99617-32d9-48b4-a31d-
7c20da2025e4
miker [Thu, 10 Jun 2010 19:15:55 +0000 (19:15 +0000)]
Patch from James Fournie of SITKA:
There was some discussion about problems with holds fulfillment at the
holds roundtable at EG2010. I am pleased to share this patch with the
community which has been thoroughly tested by the folks at
Thompson-Nicola Regional District Library. (thanks guys!)
Background:
Evergreen's default out-of-the-box behaviour for holds fulfillment is
a gas-saving method. Holds are fulfilled by proximity. In a
multibranch library, holds are fulfilled at the local branch first.
Many libraries, particularly single branch libraries may be ok with
this, but it may be problematic for other libraries.
Imagine a scenario where you have a large central branch and a small
rural branch of the same library system. At the large branch, there
are many copies of Popular New DVD with lots of holds. There are no
copies at the rural branch. Patrons at the small rural branch who
want to pick up Popular New DVD at their home branch may never get
their hold fulfilled because the copies will stay at the large branch
as long as there are holds for pickup there.
This patch adds an org unit setting that changes the opportunistic
check-in so that items checked in will be assigned to holds by request
date first, rather than proximity. This setting can be applied to
any level of the org tree, so in some situations you may even want to
activate FIFO for large libraries, but leave the original setting for
smaller libraries with less traffic who want to keep their copies more
local.
Also credit to Jeff Godin who thought of the same patch and
contributed the setting name "holds FIFO" for the setting
[ NOTE: Implications of mixed FIFO and non-FIFO environments that are
not sufficiently segregated by the use of Hard Boundaries for Holds
present a potenial for user confusion. Beware that mixing FIFO and
non-FIFO settings within a resource-sharing group will likely result in
severe imbalance of hold fulfillment, though further configuration,
development, tuning and testing may be able to mitigate these issues.
--miker ]
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@16660
dcc99617-32d9-48b4-a31d-
7c20da2025e4
erickson [Thu, 10 Jun 2010 18:48:37 +0000 (18:48 +0000)]
updated report param editor to handle join types embedded in the field name. this bug caused sporadic failed rendering of the report editor params widgets
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@16656
dcc99617-32d9-48b4-a31d-
7c20da2025e4
erickson [Tue, 8 Jun 2010 16:15:49 +0000 (16:15 +0000)]
back-porting: protect against empty results from bib searches caused by search timeouts. This allows the API call to log the error and return reasonable results
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@16626
dcc99617-32d9-48b4-a31d-
7c20da2025e4
senator [Mon, 7 Jun 2010 15:17:41 +0000 (15:17 +0000)]
Booking: make check-in op-capture behave more reasonably when elbow_room is
zero, and give the OU setting for elbow_room a default value of 1 day since
that's probably a more reasonable value than zero anyway.
Also add a smidge of documentation explaining what elbow room is for.
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@16613
dcc99617-32d9-48b4-a31d-
7c20da2025e4
senator [Fri, 4 Jun 2010 20:49:24 +0000 (20:49 +0000)]
Booking: these misc AutoGrid-based booking admin interfaces were broken
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@16595
dcc99617-32d9-48b4-a31d-
7c20da2025e4
miker [Fri, 4 Jun 2010 14:45:48 +0000 (14:45 +0000)]
forward port syntax corrections for 1.6.0.4 DB upgrade script
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@16592
dcc99617-32d9-48b4-a31d-
7c20da2025e4
miker [Fri, 4 Jun 2010 14:41:42 +0000 (14:41 +0000)]
protect the main transaction from existing permissions; individually insert permissions to avoid missing some; do not pin permission IDs, just push them into the protected range
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@16591
dcc99617-32d9-48b4-a31d-
7c20da2025e4
dbs [Fri, 4 Jun 2010 01:37:02 +0000 (01:37 +0000)]
Merge r16568 through r16572 from trunk for fixes to password reset functionality
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@16587
dcc99617-32d9-48b4-a31d-
7c20da2025e4
phasefx [Thu, 3 Jun 2010 15:08:50 +0000 (15:08 +0000)]
backport changesets 16564, 16566, 16567: fix logic error that could result in partial list of available libs for workstation registration and fix bug where attempting to use the home lib as a menu default when the home lib is not among the working location and descendeants
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@16581
dcc99617-32d9-48b4-a31d-
7c20da2025e4
phasefx [Thu, 3 Jun 2010 05:29:22 +0000 (05:29 +0000)]
more due date convenience options for offline mode, courtesy of Michael Peters, Indiana State Library
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@16575
dcc99617-32d9-48b4-a31d-
7c20da2025e4
dbs [Wed, 2 Jun 2010 17:17:50 +0000 (17:17 +0000)]
Avoid schema creation failure by ensuring metabib exists before referencing rule is created
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@16558
dcc99617-32d9-48b4-a31d-
7c20da2025e4
erickson [Tue, 1 Jun 2010 20:40:25 +0000 (20:40 +0000)]
backporting 16544: in the SIP server plugin, don't connect and start a transaction by default with every cstore handle. only connect/begin when necessary. also, making use of new CStoreEditor::init() call for setting up the editor environment when initial load was done before the IDL was available. Also, back-porting Joe A's CStoreEditor cleanup changes, namely the new init() routine.
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@16551
dcc99617-32d9-48b4-a31d-
7c20da2025e4
dbs [Tue, 1 Jun 2010 19:18:21 +0000 (19:18 +0000)]
Forward port r16547 from rel_1_6_0: fix regression in date formatting for non-due dates
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@16548
dcc99617-32d9-48b4-a31d-
7c20da2025e4
erickson [Thu, 27 May 2010 16:06:43 +0000 (16:06 +0000)]
repaired bug in dojo.mixin usage for applying overrides. support for stying fields marked readOnly via override
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@16520
dcc99617-32d9-48b4-a31d-
7c20da2025e4
miker [Wed, 26 May 2010 18:10:30 +0000 (18:10 +0000)]
1.6.0.4-1.6.1.0 upgrade script, ready for testing!
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@16508
dcc99617-32d9-48b4-a31d-
7c20da2025e4
dbs [Wed, 26 May 2010 01:30:48 +0000 (01:30 +0000)]
1.6.1.0 database upgrade script: password reset functionality
Still needs bookings support, possibly other 1.6.0-1.6.1 changes
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@16502
dcc99617-32d9-48b4-a31d-
7c20da2025e4
erickson [Tue, 25 May 2010 20:52:38 +0000 (20:52 +0000)]
Patch from Bill Ott to add missing apostrophe in rdetail.js
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@16498
dcc99617-32d9-48b4-a31d-
7c20da2025e4
erickson [Fri, 21 May 2010 20:30:02 +0000 (20:30 +0000)]
backporting r16483: enable grid paging by default. replaced showPaginator with hidePaginator option
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@16484
dcc99617-32d9-48b4-a31d-
7c20da2025e4
erickson [Fri, 21 May 2010 20:03:20 +0000 (20:03 +0000)]
back-porting a number of local dojo library fixes and enhancements. of note, autogrid caching and paging for faster paged grid display. (turning on the pager in some config interfaces to follow).
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@16482
dcc99617-32d9-48b4-a31d-
7c20da2025e4
miker [Fri, 21 May 2010 16:53:04 +0000 (16:53 +0000)]
Forward port of a patch from Dan Wells to fix the bookbag menu not showing up in Craftsman.
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@16477
dcc99617-32d9-48b4-a31d-
7c20da2025e4
miker [Sun, 16 May 2010 19:13:56 +0000 (19:13 +0000)]
allow multiple 260 tags in summary view
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@16437
dcc99617-32d9-48b4-a31d-
7c20da2025e4
phasefx [Mon, 10 May 2010 18:32:18 +0000 (18:32 +0000)]
use authoritative method here to fix race condition with patron editor and replication lag
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@16411
dcc99617-32d9-48b4-a31d-
7c20da2025e4
phasefx [Mon, 10 May 2010 18:22:08 +0000 (18:22 +0000)]
UUID::Tiny has slipped into rel_1_6 as a prerequisite
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@16410
dcc99617-32d9-48b4-a31d-
7c20da2025e4
erickson [Fri, 7 May 2010 18:54:14 +0000 (18:54 +0000)]
patch from James Fournie to repair some faulty assumptions in the previous legacy script SIP fix; additionally, I added legacy_script_support override option to oils_sip.xml.exmple to allow use of in-db circ-mod configs even if the circ code is still using circ scritps
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@16405
dcc99617-32d9-48b4-a31d-
7c20da2025e4