Dan Scott [Tue, 23 Oct 2012 16:09:11 +0000 (12:09 -0400)]
Prevent colons from breaking lines in fr-CA
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Tue, 23 Oct 2012 15:57:46 +0000 (11:57 -0400)]
TPAC: Use a single table for all content notes
Rather than having one table per kind of content note, keep them all in
a single table. Thanks to Ben Shum for the prod.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Tue, 23 Oct 2012 15:47:48 +0000 (11:47 -0400)]
TPAC: Show contents notes directly in record summary
By popular demand in IRC, move the contents notes directly into the body
of the record summary rather than hiding the content under a twisty.
This improves external indexing of the page and makes the contents notes
more immediately evident to users.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Tue, 23 Oct 2012 15:33:49 +0000 (11:33 -0400)]
More LU string customizations
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Tue, 23 Oct 2012 15:24:58 +0000 (11:24 -0400)]
TPAC: Updated PO files
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Tue, 23 Oct 2012 14:40:04 +0000 (10:40 -0400)]
Always hide content tab in Conifer
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Tue, 23 Oct 2012 14:28:34 +0000 (10:28 -0400)]
Conifer: display 500s right in the main record body
Rather than forcing users (and search engines) to open a twisty, just
display the 500 fields right in the main record body.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Mon, 22 Oct 2012 19:46:20 +0000 (15:46 -0400)]
Add detailed contents content to TPAC record summary
Drawing from the LoC MARC definitions for the 500 field, display'em if you
got'em. Given that many keyword searches are likely to draw upon this content,
we should display the matches in the record summary.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Thu, 11 Oct 2012 22:29:28 +0000 (18:29 -0400)]
Recalls - cleanse the incoming due date to ISO8601
Gotta have that missing "T" or else you're going to suffer. And suffer.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Tue, 9 Oct 2012 20:49:09 +0000 (16:49 -0400)]
Authority popups are empty: fix dojo.query() usage
When you right-click on a controllable field to display the contents of
the matching authority records, the contents of the matching authority
records simply appear as empty grey boxes.
This is another case of needing to iterate over multiple values
separately rather than using one convenient CSS selector.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Tue, 9 Oct 2012 17:14:17 +0000 (13:14 -0400)]
TPAC: Avoid the "place holds on available" lists hole
... by ripping out the option entirely, naturally.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Mon, 8 Oct 2012 19:08:47 +0000 (15:08 -0400)]
Checkout: further validation of due date override
The check_past() function failed if given a date that was not strictly
in YYYY-mm-dd format; interestingly, a common transposition typo such
as "0212-10-20" results in "212-10-20" getting passed to check_past(),
and therefore generating an invalid date. Throw an exception in
check_past() rather than returning true, because we are not in fact
stating that the due date is in the past - and catch the exception and
flag the due date override box accordingly in the checkout screen.
We could bubble the exception up to the user, but hopefully highlighting
the checkout box as being in an invalid state will catch the attention
of the users.
Signed-off-by: Dan Scott <dan@coffeecode.net>
Dan Scott [Mon, 8 Oct 2012 15:25:41 +0000 (11:25 -0400)]
TPAC: Invalid due dates cause 500 server error
CStore appears to return dates with leading 0s (such as '0212-10-08
23:59:59-05:17:32') with the leading 0s stripped off, resulting in
cases with 1-digit or 3-digit years for which DateTime::Format::ISO8601
returns an error.
We can protect against this problem by adding some defensive code to the
TPAC utility method to add the 0s back to the start of the year. We can
also log the problem when it occurs so that administrators can fix the
problem dates in the database.
Signed-off-by: Dan Scott <dan@coffeecode.net>
Dan Scott [Wed, 3 Oct 2012 19:43:26 +0000 (15:43 -0400)]
Merge branch 'rel_2_3_mergery' into rel_2_3_mergery_tpac
Lebbeous Fogle-Weekley [Fri, 28 Sep 2012 19:26:06 +0000 (15:26 -0400)]
Make scrollOnFocus default to false for dojo-based/conify interfaces
This change is intended to prevent a phenomenon in certain user
interfaces wherein clicking on a button or other widget can cause a
user's screen to suddenly jump and the user to need to click the widget
a second time before the desired function actually happens.
Dijits that have the scrollOnFocus property are the ones that tend to
exhibit this issue, especially, but not always, within the staff client
when the user's xulrunner window is not maximized.
There may be cases of interfaces actually relying on scrollOnFocus to do
something, but I think those cases should be so rare that this is still
worth doing, and exceptions can be applied there as needed.
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Signed-off-by: Ben Shum <bshum@biblio.org>
Thomas Berezansky [Tue, 19 Jun 2012 16:23:09 +0000 (12:23 -0400)]
Can't use README for version, so use configure.ac
Because one good "this works for now" being broken can be replaced with
another one easily.
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Michael Peters [Mon, 1 Oct 2012 18:51:31 +0000 (14:51 -0400)]
LP#
1020261 Better label for "Host" field in acq.edi_account
The host field of acq.edi_account is really meant to contain more than just a hostname.
It needs a scheme part, so that the whole contents of the field should be URI-ish, like
ftp://ftp1.somevendor.com
Otherwise Evergreen's EDI mechanism can guess wrongly that we want to use
SSH instead of FTP to connect.
This also adds a description for the field, in the footer, along with the other
"helpers".
Signed-off-by: Michael Peters <mrpeters@library.in.gov>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Lebbeous Fogle-Weekley [Wed, 27 Jun 2012 22:38:19 +0000 (18:38 -0400)]
Add two fields to the new FlattenerGrid-based hold pull list
Namely (current) copy status and (number of) potential copies.
I believe this implementation has a negligible impact on the efficiency
of the hold pull list query overall.
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Signed-off-by: Kathy Lussier <klussier@masslnc.org>
Bill Erickson [Mon, 24 Sep 2012 21:12:11 +0000 (17:12 -0400)]
TPAC added content lookup uses local server address
Use the current Apache server's IP address instead of apache->hostname
to determine where to route TPAC added content lookups. This allows the
server to handle the added content lookup locally instead of having to
route out and back into the cluster.
Continue using apache->hostname as the Host header to ensure the proper
virtualhost is used once the request is received.
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Michael Peters <mrpeters@library.in.gov>
Bill Erickson [Mon, 24 Sep 2012 16:50:47 +0000 (12:50 -0400)]
Added content connect timeout
Make tpac server-side added content lookups exit after a brief timeout
when the apache module is unable to open a connection to its own
top-level hostname (the virtualhost, apache->hostname).
As noted in the code comments, even though we are using Net::Server::NB
(non-blocking), it's only non-blocking in the sense of content
retrieval, not in how it calls connect() under the covers.
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Michael Peters <mrpeters@library.in.gov>
Lebbeous Fogle-Weekley [Mon, 14 May 2012 18:50:43 +0000 (14:50 -0400)]
Copy Location Order Editor: avoid interface failure with blank area
Symptom is "ll is undefined" at line 65 of previous version of this
file.
Reported by George Duimovich and John Jones.
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Signed-off-by: Ben Shum <bshum@biblio.org>
Thomas Berezansky [Thu, 20 Sep 2012 19:45:05 +0000 (15:45 -0400)]
TPac: Disable "Enter places hold" for staff
This should prevent barcode scanners from auto-submitting on scan.
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Ben Shum <bshum@biblio.org>
Jeff Godin [Wed, 25 Apr 2012 06:59:01 +0000 (02:59 -0400)]
Syndetic AC: Add more review sources with comments
* Add more Syndetic review sources (commented out)
Add additional Syndetic review sources, commented out
for performance reasons -- each source represents a distinct
request from the server to the AC provider, and we currently
lack a means of configuring which are on/off, short of
commenting / uncommenting.
* Add comments for Syndetics review sources
* Fix file name for School Library Journal reviews, add New
York Times reviews.
Signed-off-by: Jeff Godin <jgodin@tadl.org>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Art Rhyno [Tue, 2 Oct 2012 23:54:06 +0000 (19:54 -0400)]
Fix up config.tt2
I don't know how I messed this up but this is the config file that
we want for block options and google analytics.
Dan Scott [Tue, 2 Oct 2012 20:52:03 +0000 (16:52 -0400)]
Merge branch 'rel_2_3_mergery' into rel_2_3_mergery_tpac
Art Rhyno [Sat, 22 Sep 2012 04:46:20 +0000 (00:46 -0400)]
Check to see if existing loan date is less than recall date
It seems possible that a recall can be issued that actually extends
the loan period for an item with semester or other generous loan
periods. This adds a check for the current loan period and uses it
if the calculated threshold date is later.
Signed-off-by: Art Rhyno <art632000@yahoo.ca>
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Art Rhyno [Tue, 2 Oct 2012 20:31:24 +0000 (16:31 -0400)]
Increase range of holds blocking and remove material type selector
This blocks the "place hold" option in lists and also zaps my
tinkering with the "Material Type" selector.
Art Rhyno [Tue, 2 Oct 2012 04:41:21 +0000 (00:41 -0400)]
Option to hide holds from appearing at all
This may be a stretch for most sites but this suppresses the holds
link.
Bill Erickson [Fri, 21 Sep 2012 21:10:58 +0000 (17:10 -0400)]
Copy location group searching repairs
In the get_library BLOCK, upgrade any use of 'loc' to 'locg' instead of
trying to determine which to use in which situation. Before this change,
'loc' was being used as the loc_name for the main org unit selector,
which should always use 'locg'. For any other cases (related to search
params), it's always safe to use 'locg' over 'loc'.
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Mon, 1 Oct 2012 17:54:34 +0000 (13:54 -0400)]
Move the moveto to the new moveto template place
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Mon, 30 May 2011 19:23:09 +0000 (15:23 -0400)]
Add "Move to storage" quick UI for bulk location moves
This simplistic interface accepts a barcode and immediately returns
some bibliographic information if the barcode was found - and the
item is moved immediately to the specified location. Goal was to
minimize clicking, this pretty much requires just scan scan scan.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Wed, 26 Sep 2012 17:56:34 +0000 (13:56 -0400)]
Style the image, not the link, for SJCG
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Wed, 26 Sep 2012 17:45:57 +0000 (13:45 -0400)]
Remove links to the old catalogue for NOSM
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Wed, 26 Sep 2012 17:44:56 +0000 (13:44 -0400)]
No more linking to the old catalogue for SJCG
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Wed, 26 Sep 2012 16:16:23 +0000 (12:16 -0400)]
Turn on "Show more details" by default for HRSRH
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Wed, 26 Sep 2012 16:16:23 +0000 (12:16 -0400)]
Turn on "Show more details" by default for SJCG
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Wed, 26 Sep 2012 17:19:01 +0000 (13:19 -0400)]
Add some padding to the topnav logo for SJCG
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Wed, 26 Sep 2012 16:16:23 +0000 (12:16 -0400)]
Turn on "Show more details" by default for NOSM
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Tue, 25 Sep 2012 17:25:26 +0000 (13:25 -0400)]
Fix OSUL links that were broken by the new Web site
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Mon, 24 Sep 2012 18:03:18 +0000 (14:03 -0400)]
MEDIACEN doesn't charge anything on AV-EQUIP items
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Mon, 24 Sep 2012 14:36:28 +0000 (10:36 -0400)]
Add 3-day loan rule for AV-EQUIP for media centre
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Thu, 6 Sep 2012 16:25:01 +0000 (12:25 -0400)]
TPAC: Escape single quotes in MFHD record location
If an MFHD record contains an 852 field with a subfield containing a
single quote, the unescaped single quote is introduced directly into the
value of the JavaScript hash that uses single quotes as delimiters -
thereby generating a JS exception and preventing the staff client from
properly populating the MFHD Editor menu.
This commit escapes incoming single quotes from the MFHD location field
to prevent that from happening. The other fields in the JS hash are
numeric and therefore should not need escaping.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Signed-off-by: Dan Wells <dbw2@calvin.edu>
Dan Scott [Thu, 6 Sep 2012 16:25:01 +0000 (12:25 -0400)]
TPAC: Escape single quotes in MFHD record location
If an MFHD record contains an 852 field with a subfield containing a
single quote, the unescaped single quote is introduced directly into the
value of the JavaScript hash that uses single quotes as delimiters -
thereby generating a JS exception and preventing the staff client from
properly populating the MFHD Editor menu.
This commit escapes incoming single quotes from the MFHD location field
to prevent that from happening. The other fields in the JS hash are
numeric and therefore should not need escaping.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Signed-off-by: Dan Wells <dbw2@calvin.edu>
Dan Scott [Wed, 12 Sep 2012 17:08:00 +0000 (13:08 -0400)]
Merge branch 'user/dbs/rel_2_3_mergery' of git.evergreen-ils.org:contrib/Conifer into rel_2_3_mergery_tpac
Dan Scott [Wed, 12 Sep 2012 17:07:23 +0000 (13:07 -0400)]
Bring more full pubinfo over to Conifer
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Wed, 12 Sep 2012 17:02:28 +0000 (13:02 -0400)]
Bring changes from full pubinfo branch to Conifer
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Wed, 12 Sep 2012 16:59:53 +0000 (12:59 -0400)]
TPAC: Results - don't show the pubdate if we're showing full pubinfo
In the "show few details" mode, we show just the pubdate; in the "show
full details" mode, we're showing the full pubinfo and therefore do not
need to show the stubby pubdate.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Wed, 12 Sep 2012 15:50:03 +0000 (11:50 -0400)]
TPAC: Display full publication info
In both the results table and record summary, we were failing to display
the place of publication - which is critical information for people
trying to track down the right edition or constructing a bibliography.
Grab the place of publication, and then reconstruct 260abc (avoiding
another XPath iteration and giving ourselves the ability to enhance the
schema.org microdata at the same time).
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Fri, 7 Sep 2012 22:03:31 +0000 (18:03 -0400)]
And a purple link holder
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Fri, 7 Sep 2012 22:00:38 +0000 (18:00 -0400)]
ID, not class. Sheesh
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Fri, 7 Sep 2012 21:55:52 +0000 (17:55 -0400)]
Update Boreal style per dleduc's direction
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Fri, 7 Sep 2012 15:03:30 +0000 (11:03 -0400)]
Merge remote-tracking branch 'conifer/user/shadowspar/rel_2_3_algoma_tpac' into rel_2_3_mergery_tpac
Dan Scott [Fri, 7 Sep 2012 03:37:32 +0000 (23:37 -0400)]
Journal title hackery - move to a more robust location
The fix for bug #
1044721 broke the journal title hack, which probably
should have lived where this commit moves it - if, in the age of filter
groups, we decide whether it's worthwhile to keep it alive at all.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Conflicts:
Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Search.pm
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Fri, 7 Sep 2012 03:37:32 +0000 (23:37 -0400)]
Journal title hackery - move to a more robust location
The fix for bug #
1044721 broke the journal title hack, which probably
should have lived where this commit moves it - if, in the age of filter
groups, we decide whether it's worthwhile to keep it alive at all.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Rick Scott [Thu, 6 Sep 2012 15:42:25 +0000 (11:42 -0400)]
Fix link for AlgomaU/Wishart hours of operation.
Signed-off-by: Rick Scott <rick@shadowspar.dyndns.org>
Dan Scott [Wed, 5 Sep 2012 18:12:10 +0000 (14:12 -0400)]
Remove "old catalogue" links from Laurentian TPAC
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Wed, 5 Sep 2012 16:36:29 +0000 (12:36 -0400)]
Move Conifer password_hint.tt2 over to templates_conifer
Don't mess with the mainline templates. EVER.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Wed, 5 Sep 2012 16:36:29 +0000 (12:36 -0400)]
Move Conifer password_hint.tt2 over to templates_conifer
Don't mess with the mainline templates. EVER.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Wed, 5 Sep 2012 16:33:16 +0000 (12:33 -0400)]
Remove bogus password hint from TPAC login form
Sites might provide different customized help for password hints, but
there's no good reason to include erroneous default hints.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Wed, 5 Sep 2012 16:33:16 +0000 (12:33 -0400)]
Remove bogus password hint from TPAC login form
Sites might provide different customized help for password hints, but
there's no good reason to include erroneous default hints.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Wed, 5 Sep 2012 15:46:28 +0000 (11:46 -0400)]
Flag the UTF8 encoding for MARC templates
The UTF8 encoding is flagged by LDR09 being 'a'. If this is not set, it
greatly confuses Evergreen, which tries to convert what it thinks are
MARC8 characters to UTF8 before saving the record.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Wed, 5 Sep 2012 15:46:28 +0000 (11:46 -0400)]
Flag the UTF8 encoding for MARC templates
The UTF8 encoding is flagged by LDR09 being 'a'. If this is not set, it
greatly confuses Evergreen, which tries to convert what it thinks are
MARC8 characters to UTF8 before saving the record.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Wed, 5 Sep 2012 04:49:30 +0000 (00:49 -0400)]
TPAC: Fix author display
Our generic label was getting overwritten by the first specific label,
such that all following generic labels would get the specific label.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Wed, 5 Sep 2012 04:49:30 +0000 (00:49 -0400)]
TPAC: Fix author display
Our generic label was getting overwritten by the first specific label,
such that all following generic labels would get the specific label.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Wed, 5 Sep 2012 04:27:03 +0000 (00:27 -0400)]
TPAC: Fine-grained credits in record details
For 7xx fields with $4 subfields containing relator codes, generate a
relator code map from http://www.loc.gov/marc/relators/relacode.html
that we can use in the record details to provide specific credits,
rather than the generic (and often inappropriate) "Added author" label.
For example:
700 1. ‡aMaley, Desmond, ‡d1954- ‡4prf.
This now generates "Maley, Desmond, 1954- (Performer)" in the record
details credit section.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Wed, 5 Sep 2012 04:27:03 +0000 (00:27 -0400)]
TPAC: Fine-grained credits in record details
For 7xx fields with $4 subfields containing relator codes, generate a
relator code map from http://www.loc.gov/marc/relators/relacode.html
that we can use in the record details to provide specific credits,
rather than the generic (and often inappropriate) "Added author" label.
For example:
700 1. ‡aMaley, Desmond, ‡d1954- ‡4prf.
This now generates "Maley, Desmond, 1954- (Performer)" in the record
details credit section.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Jared Camins-Esakov [Sat, 1 Sep 2012 14:21:51 +0000 (10:21 -0400)]
Bug #
1044721: QP handles explicit group+joiner badly
Although the following four queries should be equivalent:
george || fred
(george) || fred
george || (fred)
(george) || (fred)
The Pg QueryParser driver generates SQL queries that return different
numbers of results for each of those queries, with all desired results
appearing only with the first query. This seems to be because of the way
filters are added in the interface.
This patch adjusts the Search code in TPAC to add an explicit group
around the user-entered query, which enables the Pg QueryParser driver
to handle all four of the above queries properly.
This patch should also resolve the problems encountered with the patch
for bug #
1040740, "Implicit ANDs should have higher precedence than
explicit ORs"
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Bill Erickson [Tue, 4 Sep 2012 18:43:27 +0000 (14:43 -0400)]
Gracefully handle reporter class with no labels
LP
1045964 -- unable to clone report template
The template interface was failing while rendering the reporter sources
drop-down when a reporter source (IDL class) had no label. This adds a
sanity check around that.
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Ben Shum <bshum@biblio.org>
Jared Camins-Esakov [Sat, 1 Sep 2012 14:21:51 +0000 (10:21 -0400)]
Bug #
1044721: QP handles explicit group+joiner badly
Although the following four queries should be equivalent:
george || fred
(george) || fred
george || (fred)
(george) || (fred)
The Pg QueryParser driver generates SQL queries that return different
numbers of results for each of those queries, with all desired results
appearing only with the first query. This seems to be because of the way
filters are added in the interface.
This patch adjusts the Search code in TPAC to add an explicit group
around the user-entered query, which enables the Pg QueryParser driver
to handle all four of the above queries properly.
This patch should also resolve the problems encountered with the patch
for bug #
1040740, "Implicit ANDs should have higher precedence than
explicit ORs"
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Bill Erickson [Tue, 4 Sep 2012 18:43:27 +0000 (14:43 -0400)]
Gracefully handle reporter class with no labels
LP
1045964 -- unable to clone report template
The template interface was failing while rendering the reporter sources
drop-down when a reporter source (IDL class) had no label. This adds a
sanity check around that.
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Ben Shum <bshum@biblio.org>
Rick Scott [Tue, 4 Sep 2012 20:09:37 +0000 (16:09 -0400)]
typo fix: 'Damtabases' -> 'Databases'
Signed-off-by: Rick Scott <rick@shadowspar.dyndns.org>
Dan Scott [Tue, 4 Sep 2012 19:26:15 +0000 (15:26 -0400)]
OSUL: Typo in reset password link on login form
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Tue, 4 Sep 2012 19:18:06 +0000 (15:18 -0400)]
Merge remote-tracking branch 'conifer/user/dbs/rel_2_3_mergery' into rel_2_3_mergery_tpac
Dan Scott [Tue, 1 May 2012 15:43:38 +0000 (11:43 -0400)]
Restore the "Local Administration" link to the splash page
From Local Admin we can get to Library Hours, and thence satisfaction.
Also fix a problem with new XUL; fallback to the CGI param for session
rather than the cookie, which new XUL doesn't play nicely with.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Conflicts:
Open-ILS/xul/staff_client/server/index.xhtml
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Tue, 4 Sep 2012 18:27:30 +0000 (14:27 -0400)]
Merge remote-tracking branch 'origin/rel_2_3' into rel_2_3_mergery
Conflicts:
Open-ILS/examples/apache/eg_vhost.conf
Open-ILS/src/Makefile.am
Open-ILS/src/perlmods/lib/OpenILS/WWW/EGWeb.pm
Open-ILS/src/templates/opac/parts/place_hold.tt2
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Thomas Berezansky [Tue, 4 Sep 2012 17:23:37 +0000 (13:23 -0400)]
Fix Merge All Records in Bucket action
A xul file was not being prefixed with oils://remote
Note: This is a quick fix. Ideally we move the url to constants.js.
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Ben Shum <bshum@biblio.org>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Dan Scott [Tue, 4 Sep 2012 17:46:41 +0000 (13:46 -0400)]
Define a few strings missing from cat.properties
By the power of build/i18n/test/check_properties.py ...
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Bill Erickson [Fri, 31 Aug 2012 22:46:27 +0000 (18:46 -0400)]
Importing translations for 2.3.rc1
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Sun, 2 Sep 2012 02:59:21 +0000 (22:59 -0400)]
Do the SQL upgrade dance for list pubdate in CSV
With a slight tweak to base the upgrade off of the event definition name
instead of the ID; possibly more resilient.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Jason Stephenson [Fri, 27 Jul 2012 13:25:05 +0000 (09:25 -0400)]
Add pub date to CSV output.
Change the template for the ContainerCSV reactor to add the publication
date (MARC 260$c) in the csv output in the same position that the previous
commit adds it to the html output.
Add an upgrade script to update the existing template for the ContainerCSV
reactor in action_trigger.event_definition.
Signed-off-by: Jason Stephenson <jstephenson@mvlc.org>
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Sat, 4 Aug 2012 14:10:48 +0000 (10:10 -0400)]
TPAC: Add the ability to set a different default locale
Installations with multiple sites might desire different default locales
for their skins. This adds the Apache config directive
"OILSWebDefaultLocale", which enables you to set the default locale on a
global and a per-skin basis.
Note that this prevents the browser Accept-language header from having
any effect; sadly that header is not often used in real life.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Signed-off-by: Art Rhyno <art632000@yahoo.ca>
Conflicts:
Open-ILS/examples/apache/eg_vhost.conf
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Rick Scott [Thu, 30 Aug 2012 20:13:25 +0000 (16:13 -0400)]
Clean up and re-style AlgomaU's OPAC templates.
In addition to adding the same graphical header so that the OPAC
more closely resembles the new Wishart website, this change
incorporates several smaller fixes:
* replace the AlgomaU "small university/big education" logo
with the small AlgomaU wordmark
* center the logo via CSS, not <center>
* fix vertical centering of the "your account log in" text --
needs margins only left & right, not on all 4 sides
* replace border on the user/pass input boxen so that they
are visible once again.
Signed-off-by: Rick Scott <rick@shadowspar.dyndns.org>
Dan Scott [Mon, 13 Aug 2012 20:50:33 +0000 (16:50 -0400)]
TPAC: Make call number browse record links retain search lib
In addition to maintaining scope for the call number browse search
results, we also need to maintain the scope for the links for the call
number records in the results themselves (for example, the "retrieve
this record" link, or the "search for this author" link).
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Signed-off-by: Ben Shum <bshum@biblio.org>
Robert Soulliere [Thu, 30 Aug 2012 18:52:08 +0000 (14:52 -0400)]
Documentation: remove file reference to line items since section was moved to another file.
Signed-off-by: Robert Soulliere <robert.soulliere@mohawkcollege.ca>
Robert Soulliere [Thu, 30 Aug 2012 18:40:00 +0000 (14:40 -0400)]
Documentation: Add sections for new features in Acquisitions
From: http://www.esilibrary.com/esi/availableDocs.php
RS added some index terms to start beefing up our index for the docs.
Signed-off-by: Robert Soulliere <robert.soulliere@mohawkcollege.ca>
Dan Scott [Thu, 30 Aug 2012 14:48:32 +0000 (10:48 -0400)]
Add an ou_host_name parameter for TPAC login forms
If set, and the incoming username does not already include an '@' symbol
(a very simple attempt to detect if we're already dealing with an email
address), then append '@' + the ou_host_name value to the username for
authentication purposes.
The rationale is that in a large consortium, you might want to enable
users to log in with short usernames (like 'fred'), but you also want to
avoid conflicts between short usernames at different organizational
units. Thus, create the users with the email equivalent of their
usernames, like 'fred@br1.example.com' and 'fred@br4.example.com', and
let the templates for the TPAC in br1 and br4 contain a hidden input
field to append the appropriate email hostname.
Truth be told, this is probably most appropriate for a large consortium
containing two or more academic institutions that hope to use LDAP
authentication rather than native authentication, and therefore have
LDAP CNs that map to email addresses of CN@hostname that can then be
mapped to actor.usr.usrname (and actor.usr.email, of course).
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Thu, 30 Aug 2012 14:48:32 +0000 (10:48 -0400)]
Add an ou_host_name parameter for TPAC login forms
If set, and the incoming username does not already include an '@' symbol
(a very simple attempt to detect if we're already dealing with an email
address), then append '@' + the ou_host_name value to the username for
authentication purposes.
The rationale is that in a large consortium, you might want to enable
users to log in with short usernames (like 'fred'), but you also want to
avoid conflicts between short usernames at different organizational
units. Thus, create the users with the email equivalent of their
usernames, like 'fred@br1.example.com' and 'fred@br4.example.com', and
let the templates for the TPAC in br1 and br4 contain a hidden input
field to append the appropriate email hostname.
Truth be told, this is probably most appropriate for a large consortium
containing two or more academic institutions that hope to use LDAP
authentication rather than native authentication, and therefore have
LDAP CNs that map to email addresses of CN@hostname that can then be
mapped to actor.usr.usrname (and actor.usr.email, of course).
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Steven Callender [Tue, 10 Jul 2012 19:43:59 +0000 (15:43 -0400)]
Changed the thawing of a hold to first update the hold record and then re-target.
When thawing a hold, originaly we were first re-targeting before actually saving the hold record. On items with large quantities, sometimes the hold would timeout on targetig before getting a chance to actually save. This patch moves things around to first save the hold record before attempting to retarget.
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Dan Scott [Thu, 30 Aug 2012 16:01:00 +0000 (12:01 -0400)]
Customize login form for Laurentian LDAP login
Now that we're synced up with LDAP authentication, provide the
appropriate guidance on the login form.
Set ou_email_host via a hidden form variable.
Provide more rational inline help for OSUL login form.
Link to the OSUL password reset form on login failure
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Thu, 30 Aug 2012 15:55:10 +0000 (11:55 -0400)]
Slightly saner login form markup
Try to provide accessibility via label attributes and move from a
table-within-a-table layout to a single table for the form.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Thu, 30 Aug 2012 17:09:53 +0000 (13:09 -0400)]
Merge branch 'user/dbs/rel_2_3_mergery' of git.evergreen-ils.org:contrib/Conifer into rel_2_3_mergery_tpac
Lebbeous Fogle-Weekley [Thu, 30 Aug 2012 16:42:01 +0000 (12:42 -0400)]
Acq: In general search, make value widgets for OU-linked fields right again
They always used to be OU selector dropdowns until a thinko in
55a82b5.
This restores them.
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Lebbeous Fogle-Weekley [Thu, 30 Aug 2012 16:20:13 +0000 (12:20 -0400)]
Acq: Fix General Search for Lineitem Attribute-based fields
Reported by Ben Shum and Kathy Lussier, the Acq General Search interface
was broken in that you couldn't use any of the search fields under
Lineitem Attribute. This error was indeed introduced by recent commit
55a82b5 as Ben determined, but simply reverting that commit left other
things broken.
This commit actually targets the problem and seems to fix it in my
testing.
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Lebbeous Fogle-Weekley [Tue, 28 Aug 2012 20:09:00 +0000 (16:09 -0400)]
Acq: New lineitems added to existing POs should inherit provider
Jeremy Miller of the Albany Public Library in Albany, OR, reports that
through the interface at
Actions For This Record -> View/Place Orders
in the staff client, when you add a lineitem to an existing PO, the new
lineitem has a null value in the "provider" field, instead of inheriting
the expected value from the PO.
This causes problems for some Acquisitions workflows.
The feature containing the bug appeared in 2.2, and this fix for it can be
backported that far.
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Bill Erickson [Wed, 2 May 2012 13:55:06 +0000 (09:55 -0400)]
ACQ support for two-step vandelay imports
If a lineitm is loaded into a queue via ACQ+Vandelay and a later attempt
is made to load the record into the catalog via ACQ+Vandelay, the
attempt will fail, because ACQ+Vandelay treats all
not-yet-fully-imported lineitems as new to vandelay. This change
inspects lineitems at vandelay processing time to determine if they are
already linked to a VL record or if a new one is needed. It also
removes the requirement that a queue be provided when all records in
process are already linked to a VL record (which already lives in a
queue).
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Kathy Lussier <klussier@masslnc.org>
Dan Scott [Mon, 27 Aug 2012 22:38:51 +0000 (18:38 -0400)]
Very rough LDAP authentication enablement for OSUL
Currently requires that the user enters their email address at the
username prompt; we then just use the local-part of the email address to
authenticate against the LDAP server.
In the VirtualHost sections of Apache, we can use SetEnv to force the
physical_loc to match the org unit ID(s) specified in opensrf.xml; for
example:
SetEnv physical_loc 103
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Mon, 27 Aug 2012 22:38:51 +0000 (18:38 -0400)]
Very rough LDAP authentication enablement for OSUL
Currently requires that the user enters their email address at the
username prompt; we then just use the local-part of the email address to
authenticate against the LDAP server.
In the VirtualHost sections of Apache, we can use SetEnv to force the
physical_loc to match the org unit ID(s) specified in opensrf.xml; for
example:
SetEnv physical_loc 103
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Bill Erickson [Fri, 24 Aug 2012 17:27:24 +0000 (13:27 -0400)]
Add kpac to 2.3 release notes
This is a snippet from the main kpac documentation in
docs/opac/kids_opac.txt, added to make sure it's represented in the
release notes.
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Robert Soulliere <robert.soulliere@mohawkcollege.ca>
Dan Scott [Tue, 28 Aug 2012 21:40:01 +0000 (17:40 -0400)]
Merge branch 'user/dbs/rel_2_3_mergery_tpac' of git.evergreen-ils.org:contrib/Conifer into rel_2_3_mergery_tpac
Dan Scott [Tue, 28 Aug 2012 21:33:46 +0000 (17:33 -0400)]
Merge branch 'user/dbs/rel_2_3_mergery' of git.evergreen-ils.org:contrib/Conifer into rel_2_3_mergery_tpac