Josh Stompro [Tue, 11 Nov 2014 19:07:36 +0000 (13:07 -0600)]
LP#
1124498 - Patron Notice when account expires - fixes and enhancements
Changes from Michael Peters initial commit
- Added repeat delay
- Removed group_field since that doesn't make sense in
this usage scenario.
- Commented out the user param for email sender, not needed.
- Removed error-to header, not commonly used anymore.
- Added Auto-Submitted header since email sent out via
this action are automatically generated.
- Changed references to card expiring to account expiring.
It is the patron's account that is expiring, not their card.
- Fixed up the address lines so it tries to grab the
mailing_address first, then the billing address.
- Set the notices to be disabled by default. So it takes some
admin action to enable.
Signed-off-by: Josh Stompro <stomproj@larl.org>
Michael Peters [Wed, 13 Feb 2013 20:52:54 +0000 (15:52 -0500)]
LP#
1124498 Patron notification via email for card expiration
The attached code creates an action/trigger event which notifies a patron, via
email, that their card is about to expire.
There are two portions to this code:
Signed-off-by: Michael Peters <mrpeters@library.in.gov>
Michael Peters [Wed, 13 Feb 2013 20:15:07 +0000 (15:15 -0500)]
Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen
Thomas Berezansky [Wed, 26 Sep 2012 14:42:41 +0000 (10:42 -0400)]
More receipt macros
Patron/Staff Middle Name and patron expiration date.
Including a YMD format variant of the latter.
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Pasi Kallinen <pasi.kallinen@pttk.fi>
Signed-off-by: Jason Stephenson <jstephenson@mvlc.org>
Thomas Berezansky [Wed, 13 Feb 2013 15:55:05 +0000 (10:55 -0500)]
Add release notes for hold patron name display
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Michael Peters <mrpeters@library.in.gov>
Signed-off-by: Ben Shum <bshum@biblio.org>
Thomas Berezansky [Wed, 13 Feb 2013 16:15:22 +0000 (11:15 -0500)]
Style barcode not found message, hide on empty
The barcode not found message should stand out more, so make it a text alert.
In addition, empty barcode isn't really "not found" but still invalid. Hide the
"barcode not found" message and disable submit on empty barcode.
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Michael Peters <mrpeters@library.in.gov>
Signed-off-by: Ben Shum <bshum@biblio.org>
Ben Shum [Wed, 13 Feb 2013 15:30:47 +0000 (10:30 -0500)]
TPAC - add "patron barcode not found" message to hold placement page
Add "Patron barcode not found" as an error text next to the barcode entry
when the lookup fails. This message helps warn staff that the barcode they
are attempting to use is not valid.
Signed-off-by: Ben Shum <bshum@biblio.org>
Signed-off-by: Michael Peters <mrpeters@library.in.gov>
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Ben Shum [Wed, 13 Feb 2013 15:27:09 +0000 (10:27 -0500)]
TPAC - gray out hold submit button
When disabled, recolor to gray to indicate that it is disabled.
This will turn back to normal once a valid user is found.
Signed-off-by: Ben Shum <bshum@biblio.org>
Signed-off-by: Michael Peters <mrpeters@library.in.gov>
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Thomas Berezansky [Wed, 13 Feb 2013 14:49:49 +0000 (09:49 -0500)]
TPac: Disable staff hold place submit button by default
Because if we don't have a barcode in the box we shouldn't be submitting.
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Ben Shum <bshum@biblio.org>
Signed-off-by: Michael Peters <mrpeters@library.in.gov>
Thomas Berezansky [Wed, 13 Feb 2013 14:06:07 +0000 (09:06 -0500)]
TPac: Invalidate 'current' barcode on invalid
Hold placement should allow you to go back to the previous valid barcode.
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Ben Shum <bshum@biblio.org>
Signed-off-by: Michael Peters <mrpeters@library.in.gov>
Thomas Berezansky [Tue, 12 Feb 2013 14:47:30 +0000 (09:47 -0500)]
TPac: Load name from patron place hold interface
only_settings is applied from there, so check if a barcode was entered.
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Ben Shum <bshum@biblio.org>
Signed-off-by: Michael Peters <mrpeters@library.in.gov>
Thomas Berezansky [Tue, 12 Feb 2013 14:10:29 +0000 (09:10 -0500)]
TPac: Load patron name when placing holds
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Ben Shum <bshum@biblio.org>
Signed-off-by: Michael Peters <mrpeters@library.in.gov>
Michael Peters [Wed, 13 Feb 2013 06:15:01 +0000 (01:15 -0500)]
Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen
Thomas Berezansky [Wed, 6 Feb 2013 21:01:49 +0000 (16:01 -0500)]
ForceExternal: Compare hostnames case insensitive
Lowercase both sides to avoid "right host, wrong case" issues.
Resolves LP1081699 where the external browser would be used due to
hostname case sensitivity.
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Ben Shum <bshum@biblio.org>
Michael Peters [Fri, 8 Feb 2013 23:15:07 +0000 (18:15 -0500)]
Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen
Ben Shum [Fri, 8 Feb 2013 22:30:52 +0000 (17:30 -0500)]
Add release note for clickable patron indicators
Signed-off-by: Ben Shum <bshum@biblio.org>
Kathy Lussier [Fri, 8 Feb 2013 21:41:43 +0000 (16:41 -0500)]
Remove See Messages from the invalid email and phone labels
The "See Messages" part of the label might be misleading since clicking these
indicators opens the patron edit screen. Since replacing the email or
phone number automatically removes these messages, there is no need to
direct the user to the messages screen.
Signed-off-by: Kathy Lussier <klussier@masslnc.org>
Signed-off-by: Ben Shum <bshum@biblio.org>
Thomas Berezansky [Thu, 11 Oct 2012 17:34:32 +0000 (13:34 -0400)]
Stop highlighting indicators
The way that commands were highlighted when selected, highlighted
both the indicators and the buttons. Change to only hightlight
the tabbed buttons.
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Ben Shum <bshum@biblio.org>
Signed-off-by: Kathy Lussier <klussier@masslnc.org>
Thomas Berezansky [Wed, 3 Oct 2012 19:27:54 +0000 (15:27 -0400)]
Make patron indicators clickable
For example, make "(See Notes)" bring you to notes, provided the patron is
already loaded (aka, not from search).
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Ben Shum <bshum@biblio.org>
Signed-off-by: Kathy Lussier <klussier@masslnc.org>
Michael Peters [Wed, 6 Feb 2013 05:15:02 +0000 (00:15 -0500)]
Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen
Dan Scott [Mon, 21 Jan 2013 22:02:42 +0000 (17:02 -0500)]
TPAC: Make locale picker match default locale
As noted by Pasi Kallinen, the language picker would not reflect the
chosen locale unless your cookie had been set or there was an explicit
CGI parameter with the locale name.
Accordingly, get the default locale from the context vars and use that
to set the selected value for the language picker in the absence of
anything else, to prevent the picker from possibly confusingly showing
the first language alphabetically rather than the currently displayed
language in the rest of the UI.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Signed-off-by: Pasi Kallinen <pasi.kallinen@pttk.fi>
Signed-off-by: Ben Shum <bshum@biblio.org>
Lebbeous Fogle-Weekley [Wed, 2 Jan 2013 17:33:36 +0000 (12:33 -0500)]
LP #
1092921: Display of/sorting by CN affixes in Simplified Hold Pull List
In the Simplified Hold Pull List interface, the "Call Number Label" column
displays the call number of the copy targeted by the hold in each row,
and it does so by combining affixes with the actual label field.
Sorting of this column actually uses the call number sortkey generated
in-database for this purpose.
Sometimes this means that sorting order doesn't match what you'd
expect to see with this column. Opinions differ on desired behavior, so
now you can explicity add columns to the table for call number prefix
and suffix, and sort on either of those (potentially in combination with
other columns).
Amended from an earlier version of this commit that still didn't sort
CN prefix and suffix columns quite right.
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Signed-off-by: Kathy Lussier <klussier@masslnc.org>
Signed-off-by: Ben Shum <bshum@biblio.org>
Michael Peters [Mon, 4 Feb 2013 20:15:02 +0000 (15:15 -0500)]
Merge branch 'master' of git://git.evergreen-ils.org/Evergreen
Mark Cooper [Tue, 16 Oct 2012 18:02:23 +0000 (11:02 -0700)]
LP#
1067361: vandelay: batch queue deletion no longer works
Because window.location.reload can trigger before the deletions
have occurred. Simple fix (band aid?) is to make the delete
calls in sync.
Signed-off-by: Mark Cooper <markchristophercooper@gmail.com>
Signed-off-by: Kathy Lussier <klussier@masslnc.org>
Signed-off-by: Ben Shum <bshum@biblio.org>
Michael Peters [Mon, 4 Feb 2013 18:15:02 +0000 (13:15 -0500)]
Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen
Ben Shum [Tue, 29 Jan 2013 05:27:55 +0000 (00:27 -0500)]
LP1054053 - Remove white padding around login inputs
Forget efforts to make the boxes bigger and smoother as it was in the past.
Instead, opting for a cleaner look by removing the extra white background
that was part of the padding surrounding the actual login input area. This
removes the feeling that the box area should have been bigger than it really
is.
Signed-off-by: Ben Shum <bshum@biblio.org>
Signed-off-by: Michael Peters <mrpeters@library.in.gov>
Michael Peters [Mon, 4 Feb 2013 16:15:07 +0000 (11:15 -0500)]
Merge branch 'master' of git://git.evergreen-ils.org/Evergreen
Michael Peters [Tue, 27 Nov 2012 14:05:35 +0000 (09:05 -0500)]
Replace "Mirror Mirror" default non-AC jacket cover
Every item in KPAC that doesn't have a jacket cover uses
the cover for "Mirror Mirror". This is inappropriate, so
lets replace it with a small blank image.
Signed-off-by: Michael Peters <mrpeters@library.in.gov>
Signed-off-by: Ben Shum <bshum@biblio.org>
Jason Etheridge [Thu, 20 Sep 2012 17:10:15 +0000 (13:10 -0400)]
LP1053526 - Don't inadvertently modify the in-memory org tree when printing
To see an example of this causing a problem, load Holdings Maintenance for
an arbitrary bib record with items. Make sure the Hide Empty Libs checkbox
is checked. Hit the Print button at the bottom of the UI (it's okay to then
Cancel the print). Then hit Refresh. It should result in an org.children()
is null error.
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Signed-off-by: Ben Shum <bshum@biblio.org>
Thomas Berezansky [Mon, 5 Nov 2012 13:48:46 +0000 (08:48 -0500)]
LP1075586 - Remove top bar in staff client
Chances are it is rigged for patron, not staff, use.
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Pasi Kallinen <pasi.kallinen@pttk.fi>
Signed-off-by: Ben Shum <bshum@biblio.org>
Michael Peters [Fri, 1 Feb 2013 18:15:07 +0000 (13:15 -0500)]
Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen
Dan Pearl [Thu, 17 Jan 2013 19:56:18 +0000 (14:56 -0500)]
LP #
1100914: Input focus for staff client portal should be the text box.
Suggested by a librarian:
Save a click by putting the initial focus of the Portal page in the search box.
Previously, entering the text box would eliminate the decorative background image;
now, pressing on any key while focus in the box will eliminate the text.
Signed-off-by: Dan Pearl <dpearl@cwmars.org>
Signed-off-by: Pasi Kallinen <pasi.kallinen@pttk.fi>
Signed-off-by: Ben Shum <bshum@biblio.org>
Michael Peters [Fri, 1 Feb 2013 17:15:06 +0000 (12:15 -0500)]
Merge branch 'master' of git://git.evergreen-ils.org/Evergreen
Kathy Lussier [Thu, 31 Jan 2013 15:51:40 +0000 (10:51 -0500)]
Copy_offset and copy_limit shouldn't persist in URL
Added copy_offset and copy_limit to stop_parms definition so that they
don't persist in URL when returning to search results or launching
subject/series searches.
Signed-off-by: Kathy Lussier <klussier@masslnc.org>
Signed-off-by: Pasi Kallinen <pasi.kallinen@pttk.fi>
Signed-off-by: Ben Shum <bshum@biblio.org>
Ben Shum [Fri, 25 Jan 2013 14:37:29 +0000 (09:37 -0500)]
TPAC - Add parse_datetime to expire_date
As reported by paxed in IRC, sometimes the function for expire_date has
troubles and you get an apache internal server error page and log errors
like:
egweb: template error: date error - bad time/date string:
expects 'h:m:s d:m:y' got: '2015-01-31T00:00:00+0200'
Adding the ctx.parse_datetime() function to wrap the ctx.user.expire_date
resolves this problem.
Signed-off-by: Ben Shum <bshum@biblio.org>
Signed-off-by: Pasi Kallinen <pasi.kallinen@pttk.fi>
Michael Peters [Tue, 29 Jan 2013 22:15:06 +0000 (17:15 -0500)]
Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen
Lebbeous Fogle-Weekley [Mon, 21 Jan 2013 19:54:55 +0000 (14:54 -0500)]
Serials: Caption/pattern wizard use enum fields for chronology when no enum
MFHD spec says that when there are no ‡a - ‡f enumeration captions, any
chronology captions should move back from their usual ‡i - ‡m places
back into enumeration space.
The predictions engine we already have deals with this better than with
the wrong patterns we were creating before, e.g.:
853 20 ‡81 ‡i(year) ‡j(month) ‡wm
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Signed-off-by: Dan Wells <dbw2@calvin.edu>
Michael Peters [Tue, 29 Jan 2013 07:15:01 +0000 (02:15 -0500)]
Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen
Dan Scott [Fri, 17 Aug 2012 20:07:19 +0000 (16:07 -0400)]
Deal with opt-in boundaries defensively
If a site had not set an 'org.patron_opt_default' OU setting, then it
seemed that a DEFAULT value was getting dumped into the "create opt-in"
INSERT statement for the org_unit argument, and that (as there is a
non-NULL constraint on the column and no default value for the column)
resulted in the patron not getting opted in.
One way for sites to deal with this is to set an opt-in boundary at the
consortial level, along the lines of:
INSERT INTO actor.org_unit_setting (org_unit, name, value)
VALUES (1, 'org.patron_opt_default', 2);
Alternatively, in the absense of any such setting, opt-in should
continue to work as it had before the new feature was added; this change
keeps the old behaviour active in that case.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Signed-off-by: James Fournie <jfournie@sitka.bclibraries.ca>
Signed-off-by: Ben Shum <bshum@biblio.org>
Bill Erickson [Mon, 5 Nov 2012 14:22:55 +0000 (09:22 -0500)]
LP1051112 - Display lineitem commands menu on empty picklists
Ensure that the lineitem commands drop-down menu appears even when the
picklist is empty. Previously, the commands were not displayed until
the first lineitem was retrieved. For empty picklists, of course, there
will be no first lineitem.
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Ben Shum <bshum@biblio.org>
Ben Shum [Thu, 11 Oct 2012 04:10:54 +0000 (00:10 -0400)]
LP1066158 - Add associated permissions to admin menu commands
For the admin menu, we had already begun to check for specific permissions
to allow staff to access the menu options. However, it is not complete.
This is a first attempt to add additional permissions to various local
and server admin options.
Signed-off-by: Ben Shum <bshum@biblio.org>
Signed-off-by: Mark Cooper <markchristophercooper@gmail.com>
Galen Charlton [Mon, 21 Jan 2013 16:38:49 +0000 (11:38 -0500)]
LP#
1102472: add about:about to staff client developer menu
The about:about page contains many XULRunner diagnostic tools.
Some useful ones include:
about:buildconfig - Get information about how the staff client is built.
about:config - Tweak XULRunner settings.
about:memory - Get detailed information about staff client memory usage.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Ben Shum <bshum@biblio.org>
Michael Peters [Sat, 26 Jan 2013 05:15:02 +0000 (00:15 -0500)]
Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen
Kathy Lussier [Sat, 26 Jan 2013 03:36:53 +0000 (22:36 -0500)]
Merge remote-tracking branch 'origin/master' into acq-invoice-doc
Kathy Lussier [Sat, 26 Jan 2013 02:35:13 +0000 (21:35 -0500)]
Documentation: acquisitions updates
Update Search for Line Items from an Invoice section to reflect minor
changes that came with lp1050008. Also, moved received Items from an
Invoice section to fall within the rest of the Invoices section.
Signed-off-by: Kathy Lussier <klussier@masslnc.org>
Michael Peters [Tue, 22 Jan 2013 15:15:07 +0000 (10:15 -0500)]
Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen
Robert Soulliere [Tue, 22 Jan 2013 14:36:08 +0000 (09:36 -0500)]
Documentation: Update staff client installation for 2.3.3 version.
Signed-off-by: Robert Soulliere <robert.soulliere@mohawkcollege.ca>
Robert Soulliere [Tue, 22 Jan 2013 14:17:26 +0000 (09:17 -0500)]
Documentation: Update upgrading the server instructions to point to 2.3.3.
Signed-off-by: Robert Soulliere <robert.soulliere@mohawkcollege.ca>
Michael Peters [Sun, 20 Jan 2013 14:15:02 +0000 (09:15 -0500)]
Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen
Ben Shum [Sun, 20 Jan 2013 06:16:13 +0000 (01:16 -0500)]
TPAC - new CSS for login help elements
Instead of having everything hard coded into the page, move important
pieces into the style.css.tt2.
Signed-off-by: Ben Shum <bshum@biblio.org>
Signed-off-by: Dan Scott <dan@coffeecode.net>
Thomas Berezansky [Fri, 21 Dec 2012 21:10:09 +0000 (16:10 -0500)]
TPAC - Remove images from login help page
Because images are hard to translate.
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Ben Shum <bshum@biblio.org>
Signed-off-by: Dan Scott <dan@coffeecode.net>
Ben Shum [Fri, 21 Dec 2012 20:47:40 +0000 (15:47 -0500)]
LP1054053 - make default input font darker
The original light grey made it difficult to see what was being input.
Change to use text font color variable (black by default).
Signed-off-by: Ben Shum <bshum@biblio.org>
Signed-off-by: Dan Scott <dan@coffeecode.net>
Michael Peters [Sat, 19 Jan 2013 21:15:07 +0000 (16:15 -0500)]
Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen
Dan Scott [Sat, 19 Jan 2013 19:28:06 +0000 (14:28 -0500)]
TPAC: Fix series display for multiple series fields
This commit adds one test record, "Harry Potter and the Goblet of Fire",
which contains multiple series fields. TPAC would display the series
fields in a purely additive fashion as the variable was not reset after
each field. Now we initialize the series var for each new series field
we retrieve, fixing the display problem.
Signed-off-by: Dan Scott <dan@coffeecode.net>
Signed-off-by: Ben Shum <bshum@biblio.org>
Ben Shum [Thu, 10 Jan 2013 22:01:05 +0000 (17:01 -0500)]
Unbold graphic 880 title display
To maintain consistency with the main title being unbolded and have
a little less bolding distraction in the record.
Signed-off-by: Ben Shum <bshum@biblio.org>
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Kathy Lussier [Thu, 10 Jan 2013 21:55:01 +0000 (16:55 -0500)]
Added 880 series display to Release Notes.
Signed-off-by: Kathy Lussier <klussier@masslnc.org>
Signed-off-by: Ben Shum <bshum@biblio.org>
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Mon, 7 Jan 2013 23:16:57 +0000 (18:16 -0500)]
Make series in record details behave
Add graphic 880 field support, as well as relying on mkurl() macro to
generate the desired URL and show the complete series on a single line
instead of having subfields appear on separate rows.
Add a sample record that contains a 440 series field linked to an 880
field.
Signed-off-by: Dan Scott <dan@coffeecode.net>
Signed-off-by: Kathy Lussier <klussier@masslnc.org>
Signed-off-by: Ben Shum <bshum@biblio.org>
Dan Scott [Sun, 6 Jan 2013 01:49:27 +0000 (20:49 -0500)]
Add test records for graphic 880 field display
"--load-all" in eg_db_config.pl will load these records with call
numbers of "G880 ", so you can shelf-browse, or search by title:
* Tu shuo Zhongguo jie
* Matsumoto Shigeharu
* Schrödinger operators
* Breathing, feeding, and neuroprotection
* Data warehousing and knowledge discovery
Signed-off-by: Dan Scott <dan@coffeecode.net>
Signed-off-by: Kathy Lussier <klussier@masslnc.org>
Signed-off-by: Ben Shum <bshum@biblio.org>
Dan Scott [Sat, 5 Jan 2013 04:55:13 +0000 (23:55 -0500)]
Release notes for alternate graphic 880 fields
Signed-off-by: Dan Scott <dan@coffeecode.net>
Signed-off-by: Kathy Lussier <klussier@masslnc.org>
Signed-off-by: Ben Shum <bshum@biblio.org>
Dan Scott [Fri, 4 Jan 2013 21:26:30 +0000 (16:26 -0500)]
TPAC: Alternate graphic fields (880) display
In the search results and record details displays, display the
corresponding 880 field(s) whenever possible.
The contents of the 880 field are generally displayed directly
underneath the corresponding primary field, with the exception of the
contributor credits on the record details page, in which the 880
contents appear between the name of the contributor and the
contributor's credit.
Signed-off-by: Dan Scott <dan@coffeecode.net>
Signed-off-by: Kathy Lussier <klussier@masslnc.org>
Signed-off-by: Ben Shum <bshum@biblio.org>
Michael Peters [Sat, 19 Jan 2013 20:15:02 +0000 (15:15 -0500)]
Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen
Ben Shum [Mon, 3 Dec 2012 15:37:43 +0000 (10:37 -0500)]
Update staff client's about page to include newest core committers
The newest core committers were elected during the Evergreen Hack-A-Way on
October 10, 2012:
Jeff Godin, Traverse Area District Library
Benjamin Shum, Bibliomation, Inc.
Jason Stephenson, Merrimack Valley Library Consortium
Also update language of page to reflect that these contributors are now core
"committers" rather than "developers". And move past core committers into
their own section.
Signed-off-by: Ben Shum <bshum@biblio.org>
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Michael Peters [Wed, 16 Jan 2013 22:15:02 +0000 (17:15 -0500)]
Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen
Lebbeous Fogle-Weekley [Wed, 16 Jan 2013 20:18:56 +0000 (15:18 -0500)]
Add 2.2.4 -> 2.2.5 upgrade script
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Bill Erickson [Wed, 16 Jan 2013 20:18:57 +0000 (15:18 -0500)]
Forward-porting 2.3.2 -> 2.3.3 DB upgrade
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Galen Charlton [Tue, 15 Jan 2013 16:30:41 +0000 (11:30 -0500)]
LP#
1098377: protect against even more cstore segfaults
Following up on the preceding patch, passing null
as the savepoint name to savepoint.release and
savepoint.rollback would also segfault cstore.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Bill Erickson [Tue, 15 Jan 2013 15:58:16 +0000 (10:58 -0500)]
Verify savepoint name is non-null
Before we attempt to mangle the name, let's ensure that it's non-null.
Otherwise, segfaults ensue.
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Dan Scott [Fri, 11 Jan 2013 06:32:13 +0000 (01:32 -0500)]
Protect against overly long savepoint names
Per http://postgresql.org/docs/9.1/static/sql-syntax-lexical.html#SQL-SYNTAX-IDENTIFIERS,
the maximum identifier length works out to being 63 bytes (+1 for the
null terminator), so to avoid potential memory pressure by a 10GB string
somehow being passed in as the savepoint name, malloc no more than 64
bytes and copy no more than 63 bytes from the incoming name to the
escaped name.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Galen Charlton [Fri, 11 Jan 2013 07:30:50 +0000 (02:30 -0500)]
LP#
1098377: sanitize savepoint names
When invoking open-ils.{cstore,pcrud,rstore}.savepoint.*, the
caller supplies a name for the savepoint. However, the savepoint
names could be constructed so that the caller could execute
arbitrary SQL. This patch sanitizes the name so that it contains
only alphanumeric and underscore characters.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Michael Peters [Wed, 16 Jan 2013 18:15:02 +0000 (13:15 -0500)]
Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen
Bill Erickson [Wed, 16 Jan 2013 16:04:23 +0000 (11:04 -0500)]
2.3.3 translations : repair Finnish translator email
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Bill Erickson [Wed, 16 Jan 2013 15:39:31 +0000 (10:39 -0500)]
2.3.3 translations : newpot
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Bill Erickson [Wed, 16 Jan 2013 15:35:33 +0000 (10:35 -0500)]
2.3.3 translations : update profiles
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Michael Peters [Wed, 16 Jan 2013 16:15:07 +0000 (11:15 -0500)]
Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen
Jason Stephenson [Mon, 10 Dec 2012 20:27:40 +0000 (15:27 -0500)]
Minor fix in Open-ILS/src/templates/opac/parts/place_hold_result.tt2
The hidden override field had two type attrs: "hidden" and "name."
I deleted the one with the value of "name."
Signed-off-by: Jason Stephenson <jstephenson@mvlc.org>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Jason Stephenson [Mon, 10 Dec 2012 15:29:21 +0000 (10:29 -0500)]
LP1076062: Hold overrides not working properly.
Edit the verify_copy_for_hold helper function to actually work. There
were cases where it would permit a copy when it shouldn't and also
disallow a copy when it should have allowed it. It now makes better
use of the oargs override argument.
If oargs has an events member, the method now removes the matching from
the list of failure events returned by the permit_copy_hold check. It
was previously bugged, stopping on the first matching event, clearing
the list of failed and events, and returning a value to indicate that
the copy is permitted for the hold, even when it may not be.
If oargs has the "all" member and there are failure events remaining,
the function loops through those events checking if the requestor has
the override permission for the event. If the requestor does have the
override permission, then the event is added to oargs->{events} to be
saved for future checks on future copies. It the requestor does not
have the override permission, then the event is pushed onto a new array
of failed events and also onto oargs->{failed}. The latter is kept
to avoid looking up events repeatedly on future copy checks.
The oargs->{failed} member is added as a shortcut to avoid repeatedly
looking up override permissions when the requestor does not have them.
It is actually checked, when present, before the user permission is
checked with a costly database lookup.
Since verify_copy_for_hold has no other way to determine that an override
was requested, it checks for the events and/or all members of oargs being
set and having a value that would evaluate to true. If oargs is undefined,
a hashref with no members, or lacks a "true" events or all member, then
verify_copy_for_hold functions as though no overrides are requested.
Additionally, all functions that call verify_copy_for_hold, either directly
or indirectly, have had their intro logic modified to only set oargs when
an override is requested and oargs is not already set. We make the assump-
tion that if oargs is set, it contains the events member. (Perhaps that is
a poor assumption, but all of the code so far looks like it will work.)
Fix test_and_create_hold_batch so that it passes the oargs parameter into
open-ils.circ.title_hold.is_possible in the way that check_title_hold (the
implementation function) actually expects it to be passed. This also means
that we need to delete oargs from the params hashref before creating the
hold objects, as that would blow up if it were present.
Signed-off-by: Jason Stephenson <jstephenson@mvlc.org>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Jason Stephenson [Wed, 5 Dec 2012 15:20:45 +0000 (10:20 -0500)]
Whitespace cleanup on aisle 9!
Fix whitespace (spaces, not tabs) in OpenILS/Application/Circ/Holds.pm.
Also, remove trailing whitespace at the end of lines.
Signed-off-by: Jason Stephenson <jstephenson@mvlc.org>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Michael Peters [Wed, 16 Jan 2013 15:15:07 +0000 (10:15 -0500)]
Merge branch 'master' of git://git.evergreen-ils.org/Evergreen
Bill Erickson [Wed, 16 Jan 2013 14:39:56 +0000 (09:39 -0500)]
Avoid CStoreEditor failures on missing log-protect
When the log_protect configuration chunk is not present in
opensrf_core.xml, gracefully move on without it. This prevents errors
like:
Can't call method \"shared\" on an undefined value at
/usr/local/share/perl/5.10.1/OpenILS/Utils/CStoreEditor.pm line 646.
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Michael Peters [Wed, 16 Jan 2013 02:15:01 +0000 (21:15 -0500)]
Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen
Thomas Berezansky [Fri, 2 Nov 2012 13:53:30 +0000 (09:53 -0400)]
Fix backdate near DST changes
When the due date and the backdate date are on opposite sides of a DST
boundary we were getting an hour off on the checkin time (using the
original due date's time).
This commit changes it so that instead we just set the hour and minute
values on the backdate date to the due date's versions, leaving the time
zone alone.
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Michael Peters [Tue, 15 Jan 2013 21:15:01 +0000 (16:15 -0500)]
Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen
Galen Charlton [Fri, 11 Jan 2013 18:11:48 +0000 (13:11 -0500)]
LP#
1098669: improve handling of Content Cafe external content in staff client
This patch introduces a new TPac content variable, ctx.ext_proto, to
specify whether external content should be retrieved via HTTP or HTTPS.
ctx.proto can't be used for that purpose since it's set to 'oils' when
TPac is running inside the staff client.
This fixes a bug where Content Cafe reviews wouldn't display in the staff
client bib record page and where clicking on the reviews link from search
results would open an empty window.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Bill Erickson [Tue, 15 Jan 2013 19:08:03 +0000 (14:08 -0500)]
2.3 Release notes update
Merge the edireader and edi_order_template release notes into the 2.3
release notes files. Added a blurb to the Upgrade Notes regarding the
lack of an automatic EDI template upgrade.
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Michael Peters [Tue, 15 Jan 2013 16:15:02 +0000 (11:15 -0500)]
Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen
Bill Erickson [Mon, 1 Oct 2012 15:54:00 +0000 (11:54 -0400)]
ACQ invoice search persistence repaired
Use XUL cookieService / cookieManager for managing cookies in embedded
web pages, since dojo.cookie cannot manage cookies within xulrunner.
Persist cookies for 30 days.
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Kathy Lussier <klussier@masslnc.org>
Michael Peters [Tue, 15 Jan 2013 05:15:01 +0000 (00:15 -0500)]
Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen
Dan Scott [Tue, 15 Jan 2013 03:39:51 +0000 (22:39 -0500)]
Docs: minor formatting fixes for "borrowing items" chapter
* Images need to have a trailing [] ; ideally this would contain the
alt text for the image, but the [] is needed to make the images
show up at all
* Since we're touching the image:: tags anyway, make the filename
extensions consistently lower case
* Fix a processing error; a bulleted list item wrapped so that > was the
first character on a line, which made Asciidoc angry. Easiest thing to
do to avoid this is just to indent the wrapped lines for each bullet
item, but we'll do the minimal thing and just indent this one line
this time.
* Fix one instance of Word "smart quotes" having replaced ye olde single
quotes.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Kathy Lussier [Tue, 15 Jan 2013 02:43:57 +0000 (21:43 -0500)]
Borrowing items: who, what, for how long
Adding Borrowing Items chapter from Evergreen in Action to the official
docs.`
Signed-off-by: Kathy Lussier <klussier@masslnc.org>
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Michael Peters [Mon, 14 Jan 2013 23:15:07 +0000 (18:15 -0500)]
Merge branches 'master' and 'master' of git://git.evergreen-ils.org/Evergreen
Bill Erickson [Tue, 11 Sep 2012 16:41:08 +0000 (12:41 -0400)]
EDI order template improvements (no SQL upgrade script!)
Improved template for EDI purchase orders. This theoretically just
works better where the old template worked. Corrections made for
interactions with ULS, Midwest Tape, Baker & Taylor, and Recorded Books
especially. GIR segments in the right place.
And also the template is just more maintainable now.
**THERE IS NO UPGRADE SCRIPT INCLUDED**. Sites using EDI may not
necessarily want to mess with what they already have working.
If you want the changes, and maybe you do, especially if you're doing
enriched ordering and/or ordering from the vendors listed above, you can
extract the template changes easily enough yourself from the
950.data.seed-values.sql file.
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Michael Peters [Mon, 14 Jan 2013 22:15:07 +0000 (17:15 -0500)]
Merge branch 'master' of git://git.evergreen-ils.org/Evergreen
Lebbeous Fogle-Weekley [Mon, 14 Jan 2013 21:59:12 +0000 (16:59 -0500)]
Upgrade script numbering for edireader branch
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Bill Erickson [Wed, 26 Dec 2012 21:27:38 +0000 (16:27 -0500)]
EDIReader release notes
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Bill Erickson [Thu, 13 Dec 2012 14:44:55 +0000 (09:44 -0500)]
Handle cancelled (back-order) lineitems in EDI invoice
Receiving an invoice for a cancelled lineitem mean the lineitem is no
longer cancelled. Identify such lineitems and uncancel them along with
the requested number of not-yet-invoiced copies.
This work flow is common for back-order items.
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Bill Erickson [Wed, 12 Dec 2012 17:50:47 +0000 (12:50 -0500)]
EDIReader: improve monetary regexes
Make no attempt to enforce/decipher monetary amounts in the regexes,
simply capture the values. If they are invalid, Postgres will let us
know.
This change allows us to capture non-numeric (\d) characters (e.g. "."),
which are of course common in monetary amounts.
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Bill Erickson [Wed, 5 Dec 2012 14:34:00 +0000 (09:34 -0500)]
EDI invoice date; invoice paid quantity/amount
* capture the invoice date in EDIReader
* apply the invoice date to inbound invoices when available instead of
defaulting to 'now'
* apply the quantity/amount billed to the quantity/amount paid to reduce
staff data entry needs
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Bill Erickson [Tue, 4 Dec 2012 15:00:26 +0000 (10:00 -0500)]
EDI: ensure lineitem 'state' matches cancel state
When cancelling a lineitem becuase all linked copies are cancelled,
ensure that the lineitem state is set to "cancelled".
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Bill Erickson [Mon, 3 Dec 2012 19:51:41 +0000 (14:51 -0500)]
EDI response honor lineitem-level status; debit cleanup
* Honor lineitem-level order status info (FTX+LIN) which indicates, in
some cases, that all ordered copies should be cancelled because the LI
as a whole is cancelled
* Delete fund debits for cancelled lineitem details when appropriate
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Bill Erickson [Mon, 3 Dec 2012 14:20:29 +0000 (09:20 -0500)]
EDI: protect against invalid order response
Do not attempt to createI EDI messages for order responses which
reference nonexistent purchase orders, since it results in
transaction commit errors on invalid foreign keys, preventing
subsequent EDI files from getting processed. Instead, log it
and skip it.
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>