miker [Thu, 14 Oct 2010 20:05:58 +0000 (20:05 +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@18345
dcc99617-32d9-48b4-a31d-
7c20da2025e4
gmc [Thu, 14 Oct 2010 19:29:26 +0000 (19:29 +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@18335
dcc99617-32d9-48b4-a31d-
7c20da2025e4
phasefx [Thu, 14 Oct 2010 15:33:44 +0000 (15:33 +0000)]
change the Swap Editor button to a persisted checkbox
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@18328
dcc99617-32d9-48b4-a31d-
7c20da2025e4
phasefx [Wed, 13 Oct 2010 17:34:13 +0000 (17:34 +0000)]
don't pass in the 'id' here or we'll get a pcrud cbs error. No source selector now, but no error either
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@18320
dcc99617-32d9-48b4-a31d-
7c20da2025e4
phasefx [Wed, 13 Oct 2010 17:12:00 +0000 (17:12 +0000)]
util.deck isn't loaded in the util_overlay in 1.6
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@18319
dcc99617-32d9-48b4-a31d-
7c20da2025e4
phasefx [Wed, 13 Oct 2010 17:00:45 +0000 (17:00 +0000)]
reworking bib_brief_vertical.xul for 1.6 to support improved record merging, since it's radically different from trunk
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@18318
dcc99617-32d9-48b4-a31d-
7c20da2025e4
miker [Wed, 13 Oct 2010 16:42:14 +0000 (16:42 +0000)]
Again, no owner in 1.6
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@18317
dcc99617-32d9-48b4-a31d-
7c20da2025e4
miker [Wed, 13 Oct 2010 16:32:59 +0000 (16:32 +0000)]
no owner in 1.6
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@18316
dcc99617-32d9-48b4-a31d-
7c20da2025e4
phasefx [Wed, 13 Oct 2010 16:31:49 +0000 (16:31 +0000)]
wrong identifier
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@18315
dcc99617-32d9-48b4-a31d-
7c20da2025e4
phasefx [Wed, 13 Oct 2010 16:31:08 +0000 (16:31 +0000)]
overzealous trimming of cat.properties
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@18314
dcc99617-32d9-48b4-a31d-
7c20da2025e4
miker [Wed, 13 Oct 2010 15:41:53 +0000 (15:41 +0000)]
some left over cruft from the backport
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@18309
dcc99617-32d9-48b4-a31d-
7c20da2025e4
miker [Wed, 13 Oct 2010 14:05:20 +0000 (14:05 +0000)]
backport editor swapping functionality from 2.0 for 1.6.2
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@18308
dcc99617-32d9-48b4-a31d-
7c20da2025e4
phasefx [Wed, 13 Oct 2010 08:33:58 +0000 (08:33 +0000)]
missed some pieces for r18306. A vertical version of the xul bib summary and the multi-bib side by side UI
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@18307
dcc99617-32d9-48b4-a31d-
7c20da2025e4
phasefx [Wed, 13 Oct 2010 08:31:55 +0000 (08:31 +0000)]
Backport new record merge interface and some batch MARC edit entrypoints from trunk, and example eg_vhost.conf. r18255, r18287, r18288, r18289, r18294
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@18306
dcc99617-32d9-48b4-a31d-
7c20da2025e4
miker [Wed, 13 Oct 2010 02:38:49 +0000 (02:38 +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_1_6@18305
dcc99617-32d9-48b4-a31d-
7c20da2025e4
miker [Wed, 13 Oct 2010 02:27:28 +0000 (02:27 +0000)]
backport oils_xpath wrappers
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@18302
dcc99617-32d9-48b4-a31d-
7c20da2025e4
miker [Wed, 13 Oct 2010 00:30:06 +0000 (00:30 +0000)]
deduplicate bibs going into the merge queue
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@18301
dcc99617-32d9-48b4-a31d-
7c20da2025e4
miker [Wed, 13 Oct 2010 00:25:59 +0000 (00:25 +0000)]
force reingest via open-ils.ingest
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@18297
dcc99617-32d9-48b4-a31d-
7c20da2025e4
miker [Wed, 13 Oct 2010 00:04:12 +0000 (00:04 +0000)]
sync upgrade script with required reality
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@18296
dcc99617-32d9-48b4-a31d-
7c20da2025e4
miker [Wed, 13 Oct 2010 00:03:56 +0000 (00:03 +0000)]
backport bits of Vandelay required to perform the appropriate XML mangling for batch update in the db
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@18295
dcc99617-32d9-48b4-a31d-
7c20da2025e4
miker [Tue, 12 Oct 2010 20:34:08 +0000 (20:34 +0000)]
Backport UI improvements from trunk
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@18292
dcc99617-32d9-48b4-a31d-
7c20da2025e4
miker [Mon, 11 Oct 2010 20:44:39 +0000 (20:44 +0000)]
Backporting r18271 and r18272 from trunk
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@18273
dcc99617-32d9-48b4-a31d-
7c20da2025e4
phasefx [Mon, 11 Oct 2010 18:12:24 +0000 (18:12 +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@18267
dcc99617-32d9-48b4-a31d-
7c20da2025e4
miker [Mon, 11 Oct 2010 17:30:38 +0000 (17:30 +0000)]
rolling back some extra bits from trunk
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@18266
dcc99617-32d9-48b4-a31d-
7c20da2025e4
miker [Mon, 11 Oct 2010 17:25:19 +0000 (17:25 +0000)]
Backporting batch update functionality for 1.6.2, along with some deps
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@18265
dcc99617-32d9-48b4-a31d-
7c20da2025e4
phasefx [Fri, 8 Oct 2010 15:45:04 +0000 (15:45 +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@18241
dcc99617-32d9-48b4-a31d-
7c20da2025e4
dbs [Fri, 8 Oct 2010 03:07:29 +0000 (03:07 +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@18235
dcc99617-32d9-48b4-a31d-
7c20da2025e4
erickson [Wed, 6 Oct 2010 20:45:49 +0000 (20:45 +0000)]
added support for honoring the due date ceiling from the duration rule. AKA, end-of-semester due dates
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@18214
dcc99617-32d9-48b4-a31d-
7c20da2025e4
scottmk [Wed, 6 Oct 2010 16:08:28 +0000 (16:08 +0000)]
Two changes to config schema:
1. Add new column date_ceiling to rule_circ_duration table.
2. New table hard_due_date.
For trunk, v1.6, v1.6.2 (eventually), and v2.1 (eventually).
NOT for v1.6.1 or v2.0.
M Open-ILS/src/sql/Pg/002.schema.config.sql
A Open-ILS/src/sql/Pg/upgrade/0432.schema.config_hard_due_date.sql
M Open-ILS/examples/fm_IDL.xml
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@18208
dcc99617-32d9-48b4-a31d-
7c20da2025e4
dbs [Tue, 5 Oct 2010 06:08:49 +0000 (06:08 +0000)]
Backport MARC Editor user interface enhancements from trunk
r16878 - Enable plain up-arrow and down-arrow to jump to next row in MARC editor
As TAB/shift-TAB move between each editable element of the MARC record,
we already have fine-grained keyboard navigation. However, moving down
10 data fields requires around 50 TAB presses or more, depending on how
many subfields are in the intervening data fields, or a looonng hold of
the tab key; not good for RSI.
The up-arrow and down-arrow keys, then, move directly to the next or
previous row, placing the focus in the first editable subfield element
rather than in the tag name (under the assumption that cataloguers are
most likely to want to edit the contents of a given subfield, and not
the tag name or indicators).
Now, in the worst-case scenario, a cataloguer who wants to edit the tag
name of a field 10 rows below their current position will have to
make 14 key presses (10 down arrows, 4 shift-TABs). Not too shabby.
r16884 - Reclaim cataloguing real estate by hiding unnecessary rows in fixed field grid editor
The fixed field grid editor currently shows blank rows for fixed field
attributes that don't apply to the currently displayed MARC record type. We
can hide these rows and offer more screen real estate for the MARC record
proper.
r16897 - Initial support for wrapping long subfields in the MARC editor
Limitations of the current approach are that the line width is arbitrarily set
to break at 100 characters, and is only calculated on a per-subfield basis. So
if a given field contains 50 subfields, each with 90 characters, this commit
isn't going to help you. (But really... in that scenario, you're beyond help
anyway!)
Also, the double-dagger aligns itself at the top of the box rather than the
middle once the box goes into multiline mode, which is annoying; but long 505
fields that scroll ten screens to the right are more annoying, so I'll commit
this for now rather than waste more time trying to CSS it into shape.
r16903 - Refactor cursor up/down and wrap long fields using Dojo
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@18164
dcc99617-32d9-48b4-a31d-
7c20da2025e4
senator [Mon, 4 Oct 2010 19:49:23 +0000 (19:49 +0000)]
Backport r18150: Hold priority control
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@18162
dcc99617-32d9-48b4-a31d-
7c20da2025e4
phasefx [Mon, 4 Oct 2010 17:16:59 +0000 (17:16 +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@18155
dcc99617-32d9-48b4-a31d-
7c20da2025e4
miker [Mon, 4 Oct 2010 16:17:31 +0000 (16:17 +0000)]
Backport r18151 from trunk: add support for hold_priority sorting in open-ils.storage.action.hold_request.nearest_hold
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@18152
dcc99617-32d9-48b4-a31d-
7c20da2025e4
scottmk [Mon, 4 Oct 2010 13:47:18 +0000 (13:47 +0000)]
Add hold_priority column to permission.grp_tree table.
For trunk and 1.6, and eventually for 1.6.2 and 2.1, but *not*
for 1.6.1 or 2.0.
A Open-ILS/src/sql/Pg/upgrade/0425.schema.perm-grp-tree-hold-priority.sql
M Open-ILS/src/sql/Pg/006.schema.permissions.sql
M Open-ILS/src/perlmods/OpenILS/Application/Storage/CDBI/permission.pm
M Open-ILS/examples/fm_IDL.xml
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@18147
dcc99617-32d9-48b4-a31d-
7c20da2025e4
dbs [Fri, 1 Oct 2010 20:18:38 +0000 (20:18 +0000)]
Set due times for durations measured in days to 23:59:59 after inserts OR updates
The existing trigger acted only on the initial insert of a circulation
transaction for duration intervals perfectly divisible by 24 hours.
If updates to those due dates were subsequently issued, then the due
time would revert to 00:00:00 - which could cause surprising overdue
fines to be generated on the due date, rather than after the due date.
This commit makes the trigger take effect on both INSERT and UPDATE
to the action.circulation table.
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@18129
dcc99617-32d9-48b4-a31d-
7c20da2025e4
miker [Fri, 1 Oct 2010 15:58:28 +0000 (15:58 +0000)]
Backporting mod_deflate config from trunk -- big speed win, yay!
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@18119
dcc99617-32d9-48b4-a31d-
7c20da2025e4
gmc [Fri, 24 Sep 2010 18:42:57 +0000 (18:42 +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@17967
dcc99617-32d9-48b4-a31d-
7c20da2025e4
phasefx [Fri, 24 Sep 2010 18:06:21 +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@17960
dcc99617-32d9-48b4-a31d-
7c20da2025e4
miker [Thu, 23 Sep 2010 15:33:03 +0000 (15:33 +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@17920
dcc99617-32d9-48b4-a31d-
7c20da2025e4
dbs [Mon, 20 Sep 2010 20:22:34 +0000 (20:22 +0000)]
Make query parser a bit more careful when converting convenience classes to search classes
Queries like "Heart disease: a global problem" were getting converted to series searches
due to the trailing "se:" in the search terms. This change ensures that the convenience
class is either at the start of the input or preceded by whitespace.
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@17847
dcc99617-32d9-48b4-a31d-
7c20da2025e4
gmc [Mon, 20 Sep 2010 08:29:15 +0000 (08:29 +0000)]
marc_add_ids - better failure recovery
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@17835
dcc99617-32d9-48b4-a31d-
7c20da2025e4
dbs [Thu, 16 Sep 2010 20:31:26 +0000 (20:31 +0000)]
Enable bookbags to have a target searchOrg that sets the appropriate search scope in opac mode
For example, http://example.com/opac/extras/feed/bookbag/opac/2378?skin=sparkly&searchOrg=BR1
would resolve to a scope of BR1 in the dynamic OPAC.
There is a more sophisticated version of this in 2.0/trunk; this is just a
stop-gap measure until then.
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@17747
dcc99617-32d9-48b4-a31d-
7c20da2025e4
dbs [Fri, 10 Sep 2010 14:48:48 +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@17568
dcc99617-32d9-48b4-a31d-
7c20da2025e4
senator [Fri, 10 Sep 2010 02:17:11 +0000 (02:17 +0000)]
Backport r17563 from trunk: booking bugfix
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@17565
dcc99617-32d9-48b4-a31d-
7c20da2025e4
senator [Fri, 10 Sep 2010 02:12:10 +0000 (02:12 +0000)]
Backport r17391 from trunk, in support of the next commit I'll make
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@17562
dcc99617-32d9-48b4-a31d-
7c20da2025e4
phasefx [Tue, 31 Aug 2010 17:14:33 +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@17410
dcc99617-32d9-48b4-a31d-
7c20da2025e4
senator [Tue, 31 Aug 2010 17:07:06 +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@17407
dcc99617-32d9-48b4-a31d-
7c20da2025e4
dbs [Tue, 31 Aug 2010 15:18:04 +0000 (15:18 +0000)]
Backport r71394 and r17395 from trunk: bib_source selection in Vandelay
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.
We also pass the record types to the MARC editor from the Vandelay and
acquisitions interfaces, for however much good that does for us (not much
at the moment).
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@17403
dcc99617-32d9-48b4-a31d-
7c20da2025e4
dbs [Tue, 31 Aug 2010 14:54:23 +0000 (14:54 +0000)]
Backport bib-source selector from trunk (r13793)
Enables one to edit the bib source of a given MARC record in the MARC editor
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@17402
dcc99617-32d9-48b4-a31d-
7c20da2025e4
dbs [Mon, 30 Aug 2010 14:58:38 +0000 (14:58 +0000)]
Merge fixes from r17372 for printing label font and margin settings
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@17374
dcc99617-32d9-48b4-a31d-
7c20da2025e4
dbs [Mon, 30 Aug 2010 14:24:30 +0000 (14:24 +0000)]
Backport r17369 from trunk: Display blank instead of 'undefined' for undefined label prefixes and suffixes
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@17370
dcc99617-32d9-48b4-a31d-
7c20da2025e4
dbs [Mon, 30 Aug 2010 14:14:12 +0000 (14:14 +0000)]
Backport spine label prefix/suffix and printing fixes for XUL 1.9.0 from trunk
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@17368
dcc99617-32d9-48b4-a31d-
7c20da2025e4
dbs [Fri, 27 Aug 2010 00:40:01 +0000 (00:40 +0000)]
Backport spine label editing enhancements to rel_1_6
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@17357
dcc99617-32d9-48b4-a31d-
7c20da2025e4
senator [Thu, 26 Aug 2010 14:56:13 +0000 (14:56 +0000)]
Backport r17346 to fix broken OPAC renewals
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@17349
dcc99617-32d9-48b4-a31d-
7c20da2025e4
atz [Tue, 24 Aug 2010 15:56:40 +0000 (15:56 +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@17327
dcc99617-32d9-48b4-a31d-
7c20da2025e4
miker [Sat, 21 Aug 2010 18:05:09 +0000 (18:05 +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@17300
dcc99617-32d9-48b4-a31d-
7c20da2025e4
erickson [Wed, 18 Aug 2010 17:40:52 +0000 (17:40 +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@17251
dcc99617-32d9-48b4-a31d-
7c20da2025e4
miker [Wed, 18 Aug 2010 16:36:54 +0000 (16:36 +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@17245
dcc99617-32d9-48b4-a31d-
7c20da2025e4
dbs [Fri, 13 Aug 2010 19:08:04 +0000 (19:08 +0000)]
Grant booking/reservation permissions in a way that is valid SQL
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@17218
dcc99617-32d9-48b4-a31d-
7c20da2025e4
dbs [Fri, 13 Aug 2010 19:03:00 +0000 (19:03 +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@17217
dcc99617-32d9-48b4-a31d-
7c20da2025e4
phasefx [Fri, 13 Aug 2010 18:42:43 +0000 (18:42 +0000)]
opac.org_unit_hiding.depth
This org unit setting will hide certain org units in the public OPAC if the Original Location (url param 'ol') for the OPAC inherits this setting. This setting specifies an org unit depth, that together with the OPAC Original
Location determines which section of the Org Hierarchy should be visible in the OPAC. For example, a stock Evergreen installation will have a 3-tier hierarchy (Consortium/System/Branch), where System has a depth of 1 and Branch
has a depth of 2. If this setting contains a depth of 1 in such an installation, then every library in the System in which the Original Location belongs will be visible, and everything else will be hidden. A depth of 0 will
effectively make every org visible. The embedded OPAC in the staff client ignores this setting.
Thanks to Bill Ott for trailblazing this area and blogging about it.
We're modifying the library selector in the default skin, the depth selector (search This Branch, Local Library System, etc.), the availability summary columns in search results, the copy details in the Record Summary page, and
the search preferences under My Account (we're simply hiding those if needed).
TODO: forward-port to trunk (which handles org unit settings a bit differently). port to craftsman?
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@17216
dcc99617-32d9-48b4-a31d-
7c20da2025e4
dbs [Thu, 12 Aug 2010 18:33:14 +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@17196
dcc99617-32d9-48b4-a31d-
7c20da2025e4
dbs [Thu, 12 Aug 2010 18:21:36 +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@17193
dcc99617-32d9-48b4-a31d-
7c20da2025e4
dbs [Thu, 12 Aug 2010 17:50:03 +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@17190
dcc99617-32d9-48b4-a31d-
7c20da2025e4
dbs [Thu, 12 Aug 2010 07:44:12 +0000 (07:44 +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@17182
dcc99617-32d9-48b4-a31d-
7c20da2025e4
dbs [Wed, 11 Aug 2010 17:13:26 +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@17172
dcc99617-32d9-48b4-a31d-
7c20da2025e4
gmc [Tue, 10 Aug 2010 21:21:53 +0000 (21:21 +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@17162
dcc99617-32d9-48b4-a31d-
7c20da2025e4
gmc [Tue, 10 Aug 2010 18:34:17 +0000 (18:34 +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@17159
dcc99617-32d9-48b4-a31d-
7c20da2025e4
dbs [Mon, 9 Aug 2010 13:15:00 +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@17132
dcc99617-32d9-48b4-a31d-
7c20da2025e4
gmc [Fri, 6 Aug 2010 20:37:45 +0000 (20:37 +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@17124
dcc99617-32d9-48b4-a31d-
7c20da2025e4
gmc [Fri, 6 Aug 2010 01:22:16 +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@17114
dcc99617-32d9-48b4-a31d-
7c20da2025e4
gmc [Fri, 6 Aug 2010 00:55:50 +0000 (00:55 +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@17110
dcc99617-32d9-48b4-a31d-
7c20da2025e4
gmc [Thu, 5 Aug 2010 03:01:04 +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@17086
dcc99617-32d9-48b4-a31d-
7c20da2025e4
miker [Fri, 23 Jul 2010 17:20:19 +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@17025
dcc99617-32d9-48b4-a31d-
7c20da2025e4
gmc [Thu, 22 Jul 2010 21:47:07 +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@17018
dcc99617-32d9-48b4-a31d-
7c20da2025e4
miker [Thu, 22 Jul 2010 01:05:18 +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@17009
dcc99617-32d9-48b4-a31d-
7c20da2025e4
miker [Wed, 21 Jul 2010 15:38:14 +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@16996
dcc99617-32d9-48b4-a31d-
7c20da2025e4
miker [Tue, 20 Jul 2010 19:56:55 +0000 (19:56 +0000)]
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@16987
dcc99617-32d9-48b4-a31d-
7c20da2025e4
miker [Tue, 20 Jul 2010 15:50:24 +0000 (15:50 +0000)]
use the correct table and field, holy moly
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@16982
dcc99617-32d9-48b4-a31d-
7c20da2025e4
erickson [Fri, 16 Jul 2010 14:18:12 +0000 (14:18 +0000)]
replace line lost during conflict resolution
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@16959
dcc99617-32d9-48b4-a31d-
7c20da2025e4
erickson [Fri, 16 Jul 2010 14:11:49 +0000 (14:11 +0000)]
back-porting action trigger fixes 16956 and 16953
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@16957
dcc99617-32d9-48b4-a31d-
7c20da2025e4
dbs [Tue, 13 Jul 2010 19:22:07 +0000 (19:22 +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@16920
dcc99617-32d9-48b4-a31d-
7c20da2025e4
miker [Fri, 9 Jul 2010 16:39:10 +0000 (16:39 +0000)]
Patch from James Fournie to address backdating timestamp format error
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@16900
dcc99617-32d9-48b4-a31d-
7c20da2025e4
dbs [Thu, 8 Jul 2010 20:11:19 +0000 (20:11 +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@16892
dcc99617-32d9-48b4-a31d-
7c20da2025e4
dbs [Thu, 8 Jul 2010 18:35:43 +0000 (18:35 +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@16889
dcc99617-32d9-48b4-a31d-
7c20da2025e4
miker [Wed, 7 Jul 2010 17:13:03 +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@16868
dcc99617-32d9-48b4-a31d-
7c20da2025e4
gmc [Thu, 1 Jul 2010 02:27:14 +0000 (02:27 +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@16839
dcc99617-32d9-48b4-a31d-
7c20da2025e4
senator [Mon, 28 Jun 2010 21:34:49 +0000 (21:34 +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@16825
dcc99617-32d9-48b4-a31d-
7c20da2025e4
miker [Tue, 22 Jun 2010 21:58:40 +0000 (21:58 +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@16782
dcc99617-32d9-48b4-a31d-
7c20da2025e4
dbs [Fri, 18 Jun 2010 04:46:20 +0000 (04:46 +0000)]
Backport security fix r16747 from trunk
1. Disable fleshing for PCRUD. Otherwise fleshing would provide a
back door whereby a user could see stuff he has no permission to see.
2. For the id_list method: strip out the "flesh_fields" entry, not
the "flesh_columns" entry (which doesn't exist). This actually makes
no difference, but if we're going to do something useless, we might
as well do it right.
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@16748
dcc99617-32d9-48b4-a31d-
7c20da2025e4
dbs [Mon, 14 Jun 2010 16:31:29 +0000 (16:31 +0000)]
I18N: get capture.js built from PO sources
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@16712
dcc99617-32d9-48b4-a31d-
7c20da2025e4
dbs [Mon, 14 Jun 2010 15:59:17 +0000 (15:59 +0000)]
r16692 resolved the lack of JSON compliance in reservation.js; turn that back on
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@16709
dcc99617-32d9-48b4-a31d-
7c20da2025e4
dbs [Mon, 14 Jun 2010 15:54:08 +0000 (15:54 +0000)]
Fix bad JSON for all remaining Dojo i18n files
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@16708
dcc99617-32d9-48b4-a31d-
7c20da2025e4
dbs [Mon, 14 Jun 2010 15:52:18 +0000 (15:52 +0000)]
Fix bad JSON in acq i18n file
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@16707
dcc99617-32d9-48b4-a31d-
7c20da2025e4
erickson [Mon, 14 Jun 2010 15:42:48 +0000 (15:42 +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@16705
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