]> git.evergreen-ils.org Git - working/Evergreen.git/log
working/Evergreen.git
12 years agoadvanced/cnbrowse label tweak
Bill Erickson [Fri, 29 Jul 2011 16:24:46 +0000 (12:24 -0400)]
advanced/cnbrowse label tweak

Signed-off-by: Bill Erickson <berick@esilibrary.com>
12 years agoPrevent undef warnings on org unit lookup
Bill Erickson [Fri, 29 Jul 2011 16:19:18 +0000 (12:19 -0400)]
Prevent undef warnings on org unit lookup

Signed-off-by: Bill Erickson <berick@esilibrary.com>
12 years agocnbrowse tweaks
Lebbeous Fogle-Weekley [Fri, 29 Jul 2011 16:11:22 +0000 (12:11 -0400)]
cnbrowse tweaks

Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
12 years agoDirect entry point into the call number browser
Lebbeous Fogle-Weekley [Fri, 29 Jul 2011 15:51:26 +0000 (11:51 -0400)]
Direct entry point into the call number browser

Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
12 years agoIf there's no sort org unit, just fall back to the usual sorting
Lebbeous Fogle-Weekley [Thu, 28 Jul 2011 20:59:59 +0000 (16:59 -0400)]
If there's no sort org unit, just fall back to the usual sorting

Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
12 years agoDon't build image tags for non-existing mattype icons
Lebbeous Fogle-Weekley [Thu, 28 Jul 2011 20:46:12 +0000 (16:46 -0400)]
Don't build image tags for non-existing mattype icons

Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
12 years agoSort copies on record detail page with copies belonging to "sort org unit" first
Lebbeous Fogle-Weekley [Thu, 28 Jul 2011 20:37:19 +0000 (16:37 -0400)]
Sort copies on record detail page with copies belonging to "sort org unit" first

"sort org unit" needs to eventually be an abstract concept that could
either refer to "orig_loc" or to "loc" or perhaps be skipped altogether,
depending on some future configuration.

Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
12 years agoFix broken builds due to test that can't find its data
Dan Scott [Thu, 28 Jul 2011 19:49:12 +0000 (15:49 -0400)]
Fix broken builds due to test that can't find its data

LP 817699 reports a problem that began with commit
e9cd992fa4dbf1013346336193cb7469ecee10a8, reintroducing a problem that
had previously been resolved with commit
f017d1261c369b9b5cc3c9cfc4f50d3cdf12a445. In short, tests can and are
run from different directories, but a new test opened a file without
making any allowance that the test might be run from anything other than
the /test/ directory.

This fix uses the dirname(__FILE__) approach to provide the appropriate
relative directory for the test data, and enables the tests to be
processed without dying.

Signed-off-by: Dan Scott <dscott@laurentian.ca>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
12 years agoitem_barcode had broken the rest of numeric search
Lebbeous Fogle-Weekley [Thu, 28 Jul 2011 19:12:28 +0000 (15:12 -0400)]
item_barcode had broken the rest of numeric search

but now it's fixed

Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
12 years agoMinor code cleanup of unused code; avoids Apache warning
Bill Erickson [Thu, 28 Jul 2011 18:32:35 +0000 (14:32 -0400)]
Minor code cleanup of unused code; avoids Apache warning

Signed-off-by: Bill Erickson <berick@esilibrary.com>
12 years agoAvoid server-error on barcode search when barcode not found
Bill Erickson [Thu, 28 Jul 2011 18:31:31 +0000 (14:31 -0400)]
Avoid server-error on barcode search when barcode not found

Signed-off-by: Bill Erickson <berick@esilibrary.com>
12 years agoMake users confirm they really want to delete lineitems from POs...
Lebbeous Fogle-Weekley [Thu, 28 Jul 2011 18:17:44 +0000 (14:17 -0400)]
Make users confirm they really want to delete lineitems from POs...

... when they've already been ordered. There's really no reason to ever
make such a deletion this that I can think of, but I use a confirm()
instead of stricter measures in case I'm missing something.

Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
12 years agoStamped upgrade for user/dbs/oclcnumbers
Bill Erickson [Thu, 28 Jul 2011 16:34:28 +0000 (12:34 -0400)]
Stamped upgrade for user/dbs/oclcnumbers

Signed-off-by: Bill Erickson <berick@esilibrary.com>
12 years agoPrevent control numbers from duplicating
Dan Wells [Thu, 21 Jul 2011 16:14:02 +0000 (12:14 -0400)]
Prevent control numbers from duplicating

In maintain_control_numbers(), if you have more than one 001 or
003, and at least one is the correct one, you will end up
duplicating the correct number every time the record is saved.

For example, if the incoming record was record ID # 12345, and
the record contained:

001: 12345
001: ocm10202

... then after maintain_control_numbers() ran, the record would
contain:

001: 12345
001: 12345

Also, clean up some leftovers from the refactor I suggested in the
previous commit.

Signed-off-by: Dan Wells <dbw2@calvin.edu>
Signed-off-by: Dan Scott <dscott@laurentian.ca>
12 years agoAdd an unwrapped upgrade script for OCLC-aware control numbers
Dan Scott [Thu, 21 Jul 2011 15:12:36 +0000 (11:12 -0400)]
Add an unwrapped upgrade script for OCLC-aware control numbers

The upgrade script creates the SCN and LCCN search indexes and
populates them using metabib.full_rec as a source; cheating, but
the normalized values will work for non-exact search purposes. Sites can
reingest all of their bibs if they want exact search to work.

Also, refactor maintain_control_numbers() using a suggestion by
Dan Wells to eliminate some duplicate code.

Signed-off-by: Dan Scott <dscott@laurentian.ca>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
12 years agoTreat OCLC numbers specially in maintain_control_numbers
Dan Scott [Thu, 21 Jul 2011 14:18:55 +0000 (10:18 -0400)]
Treat OCLC numbers specially in maintain_control_numbers

For some reason, many records that come with OCLC numbers in the 001
field are not populated with a 003 field. This resulted in the OCLC
number being thrown away entirely, rather than being moved into the 035,
as there was no corresponding control number identifier field.

However, given that we know that control numbers starting with "ocm" or
"ocn" are special OCLC numbers, we can generate the 035 accordingly even
in the absence of a 003. This update to maintain_control_numbers()
teaches it to do the right thing for OCLC numbers.

In addition, add an identifier search index so we can easily find
records by their system control numbers (035 $a subfields).

Signed-off-by: Dan Scott <dscott@laurentian.ca>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
12 years agoRevert "Add lccn field to the identifier search class"
Bill Erickson [Thu, 28 Jul 2011 16:28:23 +0000 (12:28 -0400)]
Revert "Add lccn field to the identifier search class"

This change will be absorbed when merging working/user/dbs/oclcnumbers,
which I will do pronto...

This reverts commit 94f69d21b6759dc43c151c7796dafee74083f62c.

12 years agoAdd lccn field to the identifier search class
Lebbeous Fogle-Weekley [Thu, 28 Jul 2011 16:09:01 +0000 (12:09 -0400)]
Add lccn field to the identifier search class

Facilitates easily searching by LCCN (010 ‡a).

Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
12 years agoMerge branch 'template-toolkit-opac' of git.evergreen-ils.org:evergreen/equinox into...
Bill Erickson [Thu, 28 Jul 2011 15:39:09 +0000 (11:39 -0400)]
Merge branch 'template-toolkit-opac' of git.evergreen-ils.org:evergreen/equinox into template-toolkit-opac

12 years agoRedirector support for T-pac
Bill Erickson [Thu, 28 Jul 2011 15:36:23 +0000 (11:36 -0400)]
Redirector support for T-pac

Includes new Apache configuration option:

PerlSetVar OILSRedirectTpac "true"

"Original location" is tracked initially as a URL param (orig_loc), but
is ultimately absorbed into a cookie (eg_orig_loc) since the URL param
would otherwise have to be propagated to every page.

Signed-off-by: Bill Erickson <berick@esilibrary.com>
12 years agoYou can now have multiple rows in your MARC Expert Search
Lebbeous Fogle-Weekley [Thu, 28 Jul 2011 15:10:47 +0000 (11:10 -0400)]
You can now have multiple rows in your MARC Expert Search

Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
12 years agoMARC expert search working
Lebbeous Fogle-Weekley [Wed, 27 Jul 2011 22:21:31 +0000 (18:21 -0400)]
MARC expert search working

This just needs the JS row cloning so you can search on multiple terms
at a time.

Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
12 years agoIt's ugly and hacky, but numeric search fully works (item barcode included)
Lebbeous Fogle-Weekley [Wed, 27 Jul 2011 21:31:30 +0000 (17:31 -0400)]
It's ugly and hacky, but numeric search fully works (item barcode included)

Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
12 years agoSIP2 support for checkin local holds as transits
Thomas Berezansky [Thu, 14 Jul 2011 20:49:14 +0000 (16:49 -0400)]
SIP2 support for checkin local holds as transits

Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
12 years agoCapture local holds as transits checkin modifier
Thomas Berezansky [Thu, 14 Jul 2011 20:49:08 +0000 (16:49 -0400)]
Capture local holds as transits checkin modifier

Capture holds (not already on hold shelf) as transits instead.

Use cases may include:

New material being cataloged before it is "released". If captured normally
before release the shelf expire time would start ticking and notices would go
out.

Checking items in on a closed day. Can capture holds to avoid them being on a
pull list and set them aside to avoid "ready for pickup" notices and ticking
shelf expire clock.

Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
12 years agoAuto-retarget local holds on "new" copy checkin
Thomas Berezansky [Thu, 14 Jul 2011 20:49:05 +0000 (16:49 -0400)]
Auto-retarget local holds on "new" copy checkin

When a new item is checked in local holds will be searched and re-targeted.

The search and retarget stops when a hold is found locally that the item can fill.

Already-captured holds will not be retargeted.

"New" is (currently) defined as "In progress" at checkin

Retarget occurs:
Only if the copy's circ library is the checkin library
Only if the checkin is an actual checkin (not a renewal)
Only if the checkin is capturing holds and transits

Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
12 years agoClear Shelf Expired Hold on Checkin
Thomas Berezansky [Thu, 14 Jul 2011 20:48:56 +0000 (16:48 -0400)]
Clear Shelf Expired Hold on Checkin

Only if modifier is set and at the pickup library.

Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
12 years agomove query params into the constants to better support current opac and TT-opac
Jason Etheridge [Tue, 26 Jul 2011 21:37:57 +0000 (17:37 -0400)]
move query params into the constants to better support current opac and TT-opac

Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
12 years agoMerge branch 'template-toolkit-opac' of git.evergreen-ils.org:evergreen/equinox into...
Bill Erickson [Wed, 27 Jul 2011 18:43:04 +0000 (14:43 -0400)]
Merge branch 'template-toolkit-opac' of git.evergreen-ils.org:evergreen/equinox into template-toolkit-opac

12 years agoMetarecord list on results page
Bill Erickson [Wed, 27 Jul 2011 18:40:46 +0000 (14:40 -0400)]
Metarecord list on results page

Added a new ?metarecord=<mrid> param to opac/results page to list
records associated with a given metarecord ID.  This is used as page 2
of the (pending) metarecord search process as well 'show in catalog'
for embedded staff client metarecord holds.

Signed-off-by: Bill Erickson <berick@esilibrary.com>
12 years agoNumeric search mostly works (except for item barcode)
Lebbeous Fogle-Weekley [Wed, 27 Jul 2011 17:05:02 +0000 (13:05 -0400)]
Numeric search mostly works (except for item barcode)

Expert search is next

Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
12 years agoMerge branch 'template-toolkit-opac' of git.evergreen-ils.org:evergreen/equinox into...
Bill Erickson [Wed, 27 Jul 2011 15:05:44 +0000 (11:05 -0400)]
Merge branch 'template-toolkit-opac' of git.evergreen-ils.org:evergreen/equinox into template-toolkit-opac

12 years agominor I18N text wrapping
Bill Erickson [Wed, 27 Jul 2011 15:05:41 +0000 (11:05 -0400)]
minor I18N text wrapping

Signed-off-by: Bill Erickson <berick@esilibrary.com>
12 years agoDon't show users who are already logged in a login form; that's confusing
Lebbeous Fogle-Weekley [Wed, 27 Jul 2011 13:59:19 +0000 (09:59 -0400)]
Don't show users who are already logged in a login form; that's confusing

Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
12 years agoConfirm CC payments with another page load, not confirm() popup
Lebbeous Fogle-Weekley [Tue, 26 Jul 2011 22:01:52 +0000 (18:01 -0400)]
Confirm CC payments with another page load, not confirm() popup

This does something gross. Your CC card number is rendered in a hidden
field on the last confirmation page.  At least it's all SSL only.

Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
12 years agoShow most up-to-date email address in update-email interface
Lebbeous Fogle-Weekley [Tue, 26 Jul 2011 21:31:32 +0000 (17:31 -0400)]
Show most up-to-date email address in update-email interface

plus cosmetic change to payment mini table

Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
12 years agoCC payment improvements:
Lebbeous Fogle-Weekley [Tue, 26 Jul 2011 21:05:48 +0000 (17:05 -0400)]
CC payment improvements:

Link from receipt after payment back to account summary.

Error reporting

Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
12 years agoBetter to tell the user something rather than nothing
Lebbeous Fogle-Weekley [Tue, 26 Jul 2011 19:52:59 +0000 (15:52 -0400)]
Better to tell the user something rather than nothing

Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
12 years agoAdd missing INVALID_USER_XACT_ID event user/senator/last_xact_id
Lebbeous Fogle-Weekley [Tue, 26 Jul 2011 19:13:18 +0000 (15:13 -0400)]
Add missing INVALID_USER_XACT_ID event

Code introduced in c5d36d2a99e45b9a02d00a1e795b66a38c271b43 (SVN r17079)
can generate this event.  The description I gave it is meant to be
kind of user-oriented, since patrons might see it in the OPAC.  A
somewhat more informative description in available in the commit I named
above.

Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
12 years agoRemove ? icon by "Security Code" in payment form
Lebbeous Fogle-Weekley [Tue, 26 Jul 2011 19:01:53 +0000 (15:01 -0400)]
Remove ? icon by "Security Code" in payment form

It can go back in later if we want to make it actually do something.

Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
12 years agoGive the patrons the opportunity to see and change their e-mail address...
Lebbeous Fogle-Weekley [Tue, 26 Jul 2011 18:46:18 +0000 (14:46 -0400)]
Give the patrons the opportunity to see and change their e-mail address...

... before they submit fine payments.  This way they have a better
chance of getting a receipt e-mailed to them.

Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
12 years agoStamped upgrade script for persistent_login_default_perm
Bill Erickson [Tue, 26 Jul 2011 15:46:39 +0000 (11:46 -0400)]
Stamped upgrade script for persistent_login_default_perm

Signed-off-by: Bill Erickson <berick@esilibrary.com>
12 years agoAdd the PERSISTENT_LOGIN permission to the system, and ...
Lebbeous Fogle-Weekley [Tue, 26 Jul 2011 15:21:20 +0000 (11:21 -0400)]
Add the PERSISTENT_LOGIN permission to the system, and ...

... make it belong to Users (which includes Staff and Patrons) by
default.

This doesn't mean that all logins are persistent (long-lived) by
default, it just means that users do have the permission to request a
long-lived auth session by default.

Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
12 years agoPersistent logins are more of a "stay logged in" feature than a "remember me"
Lebbeous Fogle-Weekley [Tue, 26 Jul 2011 15:04:24 +0000 (11:04 -0400)]
Persistent logins are more of a "stay logged in" feature than a "remember me"

Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
12 years agoLoad embedded OPAC via SSL by default, w/ override option
Jason Etheridge [Tue, 26 Jul 2011 14:33:13 +0000 (10:33 -0400)]
Load embedded OPAC via SSL by default, w/ override option

* url_prefix option for using/forcing SSL.
* oils.secure_opac preference for doing such with the embedded OPAC

--------

To use the preference, you may want to include something like this in server/skin/custom.js:

// Force non-SSL for the OPAC
try {
    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
    var prefs = Components.classes['@mozilla.org/preferences-service;1'].getService(Components.interfaces['nsIPrefBranch']);
    if (!prefs.prefHasUserValue('oils.secure_opac')) {
        prefs.setBoolPref('oils.secure_opac',false);
    }
} catch(E) {
    alert('Error in custom.js trying to set oils.secure_opac preference to false: ' + E + '\n');
}

Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
12 years agoLinks to return to payment history from receipt print/email pages
Lebbeous Fogle-Weekley [Tue, 26 Jul 2011 14:49:34 +0000 (10:49 -0400)]
Links to return to payment history from receipt print/email pages

Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
12 years agoUbuntu Lucid needs MARC::Record from CPAN
Dan Scott [Tue, 26 Jul 2011 00:09:18 +0000 (20:09 -0400)]
Ubuntu Lucid needs MARC::Record from CPAN

As Ubuntu Lucid ships with MARC::Record 2.0.0, and Serials requires
2.0.1 or greater, we must install MARC::Record from CPAN or face failing
open-ils.search requests.

Signed-off-by: Dan Scott <dscott@laurentian.ca>
12 years agoSelect-all checkboxes for fine payment
Lebbeous Fogle-Weekley [Mon, 25 Jul 2011 21:55:58 +0000 (17:55 -0400)]
Select-all checkboxes for fine payment

In the process, had to change the checkbox/cgi param name of the misc
fees to xact_misc and tell the middle layer to lump xact together with
xact_misc.  Should test carefully.

Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
12 years agoCorrectly populate certain columns in the patron Messages interface
Jason Etheridge [Thu, 21 Jul 2011 18:52:45 +0000 (14:52 -0400)]
Correctly populate certain columns in the patron Messages interface

When applying penalties, the csp's referenced by the ausp's are fleshed.

Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
12 years agoStamped upgrade script for checkout_fills_related_hold_exact_match
Bill Erickson [Mon, 25 Jul 2011 21:24:13 +0000 (17:24 -0400)]
Stamped upgrade script for checkout_fills_related_hold_exact_match

Signed-off-by: Bill Erickson <berick@esilibrary.com>
12 years agoUnwrapped Upgrade Script
Thomas Berezansky [Mon, 25 Jul 2011 19:28:47 +0000 (15:28 -0400)]
Unwrapped Upgrade Script

for Checkout Fills Related Hold modifications

Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
12 years agoCheckout Fills Related Hold modifications
Thomas Berezansky [Mon, 25 Jul 2011 19:26:08 +0000 (15:26 -0400)]
Checkout Fills Related Hold modifications

Two changes:

1 - Check hold_copy_map for related holds

This removes the "Title or Volume hold only" restriction, allowing any hold type to fill.
This check happens first whenever the option is enabled.

2 - Add new option for *only* checking hold_copy_map.

This allows for non-holdable copies to not fill Title or Volume holds on checkout.

Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
12 years agoStamped upgrade script for uncheck_bills_and_unfocus_payment_box
Bill Erickson [Mon, 25 Jul 2011 21:15:44 +0000 (17:15 -0400)]
Stamped upgrade script for uncheck_bills_and_unfocus_payment_box

Signed-off-by: Bill Erickson <berick@esilibrary.com>
12 years agoGUI: Uncheck bills by default in the patron billing interface
Jason Etheridge [Wed, 20 Jul 2011 19:20:00 +0000 (15:20 -0400)]
GUI: Uncheck bills by default in the patron billing interface

Org unit setting and behavior.  Also defaults the focus to the Uncheck All
button instead of the Payment Received field in that interface.

Signed-off-by: Jason Etheridge <jason@esilibrary.com>
12 years agoEmpty case for payment history
Lebbeous Fogle-Weekley [Mon, 25 Jul 2011 21:06:47 +0000 (17:06 -0400)]
Empty case for payment history

Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
12 years agoAdd support for Holds and Items counts in dynamic staff Record Summary
Jason Etheridge [Mon, 11 Jul 2011 11:22:01 +0000 (07:22 -0400)]
Add support for Holds and Items counts in dynamic staff Record Summary

(use 'holds' and 'items' with your
oils.bib_brief.*.dynamic_grid_replacement.data customizations)

Also make the Bib Call # retrieval asynchronous and dependent on the field being
configured for display.  This branch has merged in (and depends on) the changes
from collab/phasefx/dynamic_bib_brief

Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
12 years agoLP#813151 Copy Location sort order in Advanced Search
Michael Peters [Thu, 21 Jul 2011 15:21:34 +0000 (11:21 -0400)]
LP#813151 Copy Location sort order in Advanced Search

This patch addresses the unintuitive copy location sort order in
Advanced Search when searching at a specific branch. Thanks to
Dan Wells for the code suggestion which changes the order in the listbox
to alphabetical sort by asset.copy_location.name.
Tested, and confirmed working in 2.0.4 test and production environments.

Signed-off-by: Michael Peters <mrpeters@library.in.gov>
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
12 years agoYAOUS to limit OPAC payment history display to configured interval
Lebbeous Fogle-Weekley [Mon, 25 Jul 2011 20:21:48 +0000 (16:21 -0400)]
YAOUS to limit OPAC payment history display to configured interval

Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
12 years agoMerge branch 'acq-copies-li-summary-etc'
Lebbeous Fogle-Weekley [Mon, 25 Jul 2011 19:08:48 +0000 (15:08 -0400)]
Merge branch 'acq-copies-li-summary-etc'

12 years agoLineitem copies page layout changes
Bill Erickson [Mon, 25 Jul 2011 18:15:25 +0000 (14:15 -0400)]
Lineitem copies page layout changes

Move the Distribution Formula selector above the batch editor widgets
mainly so the batch editor widgets sit closer to batch edit target copy
grid.

Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
12 years agoNOVELIST/CHILIFRESH include statements missing a hash which was causing (none) errors.
James Fournie [Fri, 10 Jun 2011 18:27:47 +0000 (11:27 -0700)]
NOVELIST/CHILIFRESH include statements missing a hash which was causing (none) errors.

Signed-off-by: James Fournie <jfournie@sitka.bclibraries.ca>
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
12 years agoShow LI summary in copies display page
Bill Erickson [Mon, 25 Jul 2011 17:24:53 +0000 (13:24 -0400)]
Show LI summary in copies display page

Using the new, self-contained Lineitem.fetchAndRender, show a full LI
summary along the top of the LI copies edit page.

Includes some minor layout smoothing

Signed-off-by: Bill Erickson <berick@esilibrary.com>
12 years agoMerge branch 'xul_date_sort'
Lebbeous Fogle-Weekley [Mon, 25 Jul 2011 16:14:01 +0000 (12:14 -0400)]
Merge branch 'xul_date_sort'

12 years agoadjust legacy xul column definitions for dates/timestamps to ensure correct sorting
Jason Etheridge [Wed, 20 Jul 2011 05:29:43 +0000 (01:29 -0400)]
adjust legacy xul column definitions for dates/timestamps to ensure correct  sorting

Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
12 years agoMerge branch 'parts-hold-warning-fix'
Lebbeous Fogle-Weekley [Mon, 25 Jul 2011 15:55:36 +0000 (11:55 -0400)]
Merge branch 'parts-hold-warning-fix'

12 years agoManage parts holds warning (and removal) w/ CSS
Bill Erickson [Mon, 25 Jul 2011 15:38:17 +0000 (11:38 -0400)]
Manage parts holds warning (and removal) w/ CSS

Use add/removeCSSClass to apply and remove holds parts selector
warning instead of inline style.border management, which (when using
'auto') causes problems in IE.

Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
12 years agoMerge branch 'sound_of_checkin'
Lebbeous Fogle-Weekley [Mon, 25 Jul 2011 15:45:44 +0000 (11:45 -0400)]
Merge branch 'sound_of_checkin'

12 years agomore sound hooks during check-in for transits, holds, etc.
Jason Etheridge [Wed, 20 Jul 2011 20:51:46 +0000 (16:51 -0400)]
more sound hooks during check-in for transits, holds, etc.

Adds util.sound.special which can be used like this:

    util.sound.special('foo');

and looks for a URL constant matching this:

    urls['AUDIO_special_foo']

Also give util.sound a more programmable delay via custom.js:

    var _sound_delay_interval = 50000;

Here are the new hooks for check-in and how you might use them:

    urls['AUDIO_special_checkin.cataloging'] = '/xul/server/skin/media/custom/cataloging.wav';
    urls['AUDIO_special_checkin.error'] = '/xul/server/skin/media/custom/error.wav';
    urls['AUDIO_special_checkin.hold_capture_delayed'] = '/xul/server/skin/media/custom/hold_capture_delayed.wav';
    urls['AUDIO_special_checkin.hold_shelf'] = '/xul/server/skin/media/custom/hold_shelf.wav';
    urls['AUDIO_special_checkin.no_change'] = '/xul/server/skin/media/custom/no_change.wav';
    urls['AUDIO_special_checkin.not_found'] = '/xul/server/skin/media/custom/not_found.wav';
    urls['AUDIO_special_checkin.reservation_shelf'] = '/xul/server/skin/media/custom/reservation_shelf.wav';
    urls['AUDIO_special_checkin.success'] = '/xul/server/skin/media/custom/success.wav';
    urls['AUDIO_special_checkin.transit'] = '/xul/server/skin/media/custom/transit.wav';
    urls['AUDIO_special_checkin.transit_for_hold'] = '/xul/server/skin/media/custom/transit_for_hold.wav';

Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
12 years agoMerge branch 'hold_queue_position_sorting'
Lebbeous Fogle-Weekley [Mon, 25 Jul 2011 15:24:38 +0000 (11:24 -0400)]
Merge branch 'hold_queue_position_sorting'

12 years agosort hold Queue Position column correctly in xul lists
Jason Etheridge [Wed, 20 Jul 2011 05:49:07 +0000 (01:49 -0400)]
sort hold Queue Position column correctly in xul lists

Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
12 years agoComment out line that breaks holds placement in IE
Thomas Berezansky [Mon, 25 Jul 2011 14:14:55 +0000 (10:14 -0400)]
Comment out line that breaks holds placement in IE

auto is not a valid option for a border, and IE faults on it.
Other browsers seem to ignore it, as far as I can tell.

Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
12 years agoMerge branch 'template-toolkit-opac' of git.evergreen-ils.org:evergreen/equinox into...
Mike Rylander [Sun, 24 Jul 2011 15:14:19 +0000 (11:14 -0400)]
Merge branch 'template-toolkit-opac' of git.evergreen-ils.org:evergreen/equinox into template-toolkit-opac

12 years agoMerge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac
Mike Rylander [Sun, 24 Jul 2011 15:14:15 +0000 (11:14 -0400)]
Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac

12 years agoAdd cointainer() and record_list() filters to QueryParser
Mike Rylander [Fri, 22 Jul 2011 19:10:23 +0000 (15:10 -0400)]
Add cointainer() and record_list() filters to QueryParser

The container() filter takes 3 or 4 positional params:
  - class (bre, acn, acp, au)
  - type  (bookbag, etc -- btype of the container)
  - id    (container id)
  - token (authtoken, optional, for checkin ownership of non-public containers)

The record_list() filter takes a list of record ids to restrict the search by.
These are bib ids by default, but are treated as metarecord ids in the presence
of the #metabib (aka #metarecord) modifier.

Signed-off-by: Mike Rylander <mrylander@gmail.com>
12 years agoMore better call number browser, uses supercat directly, doesn't use mvr
Lebbeous Fogle-Weekley [Fri, 22 Jul 2011 17:04:37 +0000 (13:04 -0400)]
More better call number browser, uses supercat directly, doesn't use mvr
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
12 years agoAlso was missing the author search link
Lebbeous Fogle-Weekley [Fri, 22 Jul 2011 14:28:04 +0000 (10:28 -0400)]
Also was missing the author search link

Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
12 years agoCall number shelf browser: fix prev/next links, wrong argument order in...
Lebbeous Fogle-Weekley [Fri, 22 Jul 2011 14:22:08 +0000 (10:22 -0400)]
Call number shelf browser: fix prev/next links, wrong argument order in...

... call to open-ils.search.callnumber.browse (count and offset mixed
up)

Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
12 years agoShelf browser!
Lebbeous Fogle-Weekley [Fri, 22 Jul 2011 13:59:57 +0000 (09:59 -0400)]
Shelf browser!

Needs improvements: can't find jacket images by UPC yet

Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
12 years agoMore power to present friendly messages when hold placement fails
Lebbeous Fogle-Weekley [Wed, 20 Jul 2011 22:02:47 +0000 (18:02 -0400)]
More power to present friendly messages when hold placement fails

This area could use a little cleanup, elegance, but it can give end
users better messages for a diverse set of reasons why hold placement
failed.

Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
12 years agoMerge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac
Bill Erickson [Wed, 20 Jul 2011 18:19:41 +0000 (14:19 -0400)]
Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac

12 years agoLP#647121 Event handling on override abort
Michael Peters [Wed, 20 Jul 2011 15:09:40 +0000 (11:09 -0400)]
LP#647121 Event handling on override abort

Discussed on IRC, phasefx discovered that several events were not being properly
handled when they were empty strings.  Tested and working on Evergreen 2.0.4.

Signed-off-by: Michael Peters <mrpeters@library.in.gov>
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
12 years agoremove circ.util.std_map_row_to_columns; default to the one provided by list.js
Jason Etheridge [Mon, 18 Jul 2011 21:17:30 +0000 (17:17 -0400)]
remove circ.util.std_map_row_to_columns; default to the one provided by list.js

Signed-off-by: Jason Etheridge <jason@esilibrary.com>
12 years agoBetter sort support for xul lists (see launchpad bug ://bugs.launchpad.net/evergreen...
Jason Etheridge [Mon, 18 Jul 2011 19:27:22 +0000 (15:27 -0400)]
Better sort support for xul lists (see launchpad bug ://bugs.launchpad.net/evergreen/+bug/751745)
Example of supplying a sort_value function for item Create Date, and automatic sort_value for fm_columns-generated timestamp and money column definitions.
Need to provide more such functions, and eventually move everything over to fm_columns

Signed-off-by: Jason Etheridge <jason@esilibrary.com>
12 years agoMerge branch 'master' of git://git.evergreen-ils.org/Evergreen
Lebbeous Fogle-Weekley [Tue, 19 Jul 2011 21:04:38 +0000 (17:04 -0400)]
Merge branch 'master' of git://git.evergreen-ils.org/Evergreen

12 years agoMerge remote branch 'working/user/dbwells/lp_811255_compressed_holdings_fixes'
Lebbeous Fogle-Weekley [Tue, 19 Jul 2011 20:53:06 +0000 (16:53 -0400)]
Merge remote branch 'working/user/dbwells/lp_811255_compressed_holdings_fixes'

Dan's tests pass, and I don't see any problems or ill effects on a
working system with serials loaded.

Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
12 years agoMake inactive cards/patrons "not exist" via SIP2
Thomas Berezansky [Mon, 18 Jul 2011 00:28:14 +0000 (20:28 -0400)]
Make inactive cards/patrons "not exist" via SIP2

And make sure if we do get a deleted patron for some reason they are ignored too.

Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
12 years agorerun DB update 0582 to avoid upgrade problem
Galen Charlton [Tue, 19 Jul 2011 18:43:03 +0000 (14:43 -0400)]
rerun DB update 0582 to avoid upgrade problem

This implements the same update as 0582.schema.aging_circ_view.sql,
and exists purely the the sake of avoid a potential upgrade
glitch for somebody who's upgrading from 2.0.8+ that includes
a version of this fix that's not compatible with with 2.1+.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
12 years agoMFHD compressed holding fixes user/dbwells/lp_811255_compressed_holdings_fixes
Dan Wells [Tue, 19 Jul 2011 16:02:17 +0000 (12:02 -0400)]
MFHD compressed holding fixes

1. Add new utility method to MFHD.pm:
    holdings_by_caption(): return all holdings attached to a
    given caption

2. Add 'passthru_open_ended' option to get_decompressed_holdings()
    Previously, attempts to decompress an open-ended holding
    would error out.  Now, in the absence of this option,
    open-ended holdings are discarded and you get a warning
    (since they cannot logically be decompressed), while if
    this option is 'true' they are passed back unaffected

3. compressed_to_last() on an open-ended holding now more
   correctly returns 'undef' rather than the unaltered holding

4. get_compressed_holdings() will now honor an open-ended holding
   by treating it as "infinite", and thus absorbing any holdings
   which would follow

5. Overloaded comparison operator now correctly detects "swap"
   cases (where only the second operand is a holding)

6. Overloaded comparison operator now consistently treats
   open-ended holdings as "greater-than" a single or closed
   holding which has the same starting point

7. Fix 2 thinkos in comparison operator for overlapping
   compressed holdings

8. Add new compressed_end() method to Holding.pm which can add
   or set a new ending to a holding, making compressed if needed

9. Correctly recognize partially compressed holdings
    If a holding is defined as:
        863 40 $81.1 $a1 $b2-10
    this actually means:
        863 40 $81.1 $a1-1 $b2-10
    so let's make sure to treat it that way.

9. Expand the MFHD test suite to better cover the improvements
   in this commit

There is also the beginnings of a _get_truncated_holdings()
method for handling odd cases where an open-ended holding is
followed by a single/closed holding, but it is currently
commented out, pending further design consideration.

Signed-off-by: Dan Wells <dbw2@calvin.edu>
12 years agolp#812550: Removed nulls from showing for patron penalties when no note attached...
Steven Callender [Mon, 18 Jul 2011 20:26:13 +0000 (20:26 +0000)]
lp#812550: Removed nulls from showing for patron penalties when no note attached to penalty.

Signed-off-by: Steven Callender <stevecallender@esilibrary.com>
Signed-off-by: Michael Peters <mrpeters@library.in.gov>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
12 years agoFix the wrongish way we were doing staff-assisted holds
Lebbeous Fogle-Weekley [Mon, 18 Jul 2011 22:49:01 +0000 (18:49 -0400)]
Fix the wrongish way we were doing staff-assisted holds

Now the patron that a staff user wants to place a hold for is passed
around as a cookie

It's a little unclear when is best from a workflow perspective to kill
said cookie... hrmmm....

Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
12 years agobump xulrunner version
Jason Etheridge [Mon, 18 Jul 2011 20:24:30 +0000 (16:24 -0400)]
bump xulrunner version

Signed-off-by: Jason Etheridge <jason@esilibrary.com>
12 years agoMerge remote branch 'working/collab/phasefx/unified_vol_copy_ui_from_item_status_ui'
Lebbeous Fogle-Weekley [Mon, 18 Jul 2011 19:48:39 +0000 (15:48 -0400)]
Merge remote branch 'working/collab/phasefx/unified_vol_copy_ui_from_item_status_ui'

Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
12 years agoMerge branch 'master' of git://git.evergreen-ils.org/Evergreen into template-toolkit...
Lebbeous Fogle-Weekley [Mon, 18 Jul 2011 17:56:38 +0000 (13:56 -0400)]
Merge branch 'master' of git://git.evergreen-ils.org/Evergreen into template-toolkit-opac

12 years agoAlert or block holds on available copy at same pickup lib
Lebbeous Fogle-Weekley [Mon, 18 Jul 2011 17:40:17 +0000 (13:40 -0400)]
Alert or block holds on available copy at same pickup lib

This improves upon the earlier commit that attempted to deal with what
to do when either of these org_unit settings are true:

     circ.holds.hold_has_copy_at.alert
     circ.holds.hold_has_copy_at.block

The correct use of these settings are that when /any/ type of hold is
attempted at a given pickup lib, if either of those settings are true in
the context of said pickup lib, and there are copies in an available
status at the pickup lib already, inform the user before placing the
hold.  In the alert case, the user can place the hold anyway with
another click.  In the block case, there's an end on't.
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
12 years agoRemove extraneous COMMIT message in 950 seed data
Dan Scott [Mon, 18 Jul 2011 15:43:13 +0000 (11:43 -0400)]
Remove extraneous COMMIT message in 950 seed data

The extra COMMIT message didn't hurt when creating a new schema, but did
result in a warning message that could cause confusion. So, get rid of
it to avoid that.

Signed-off-by: Dan Scott <dscott@laurentian.ca>
12 years agoItem Status->Alternate View support for the dynamic Record Summary
Jason Etheridge [Wed, 6 Jul 2011 18:52:53 +0000 (14:52 -0400)]
Item Status->Alternate View support for the dynamic Record Summary

For now, you could put something like this in server/skin/custom.js to re-configure the display:

try {

    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
    var prefs = Components.classes['@mozilla.org/preferences-service;1'].getService(Components.interfaces['nsIPrefBranch']);
    prefs.setCharPref(
        'oils.bib_brief.alternate_copy_summary.dynamic_grid_replacement.data',
        js2JSON([
            ['title',       'edition',  'editor'],
            ['author',      'pubdate',  'edit_date'],
            ['call_number', 'tcn',      'create_date']
        ])
    );

} catch(E) {
    dump('Error in custom.js trying to set oils.bib_brief.alternate_copy_summary.dynamic_grid_replacement.data: ' + E + '\n');
}

Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
12 years agodynamic Record Summary layout based on preference
Jason Etheridge [Wed, 6 Jul 2011 07:19:09 +0000 (03:19 -0400)]
dynamic Record Summary layout based on preference

For now, you could add something like this to server/skin/custom.js to re-configure the display:

try {

    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
    var prefs = Components.classes['@mozilla.org/preferences-service;1'].getService(Components.interfaces['nsIPrefBranch']);
    prefs.setCharPref(
        'oils.bib_brief.horizontal.dynamic_grid_replacement.data',
        js2JSON([
            ['title',           'edition',  'editor'],
            ['author',          'pubdate',  'edit_date'],
            ['bib_call_number', 'tcn',      'create_date']
        ])
    );

} catch(E) {
    dump('Error in custom.js trying to set oils.bib_brief.horizontal.dynamic_grid_replacement.data: ' + E + '\n');
}

Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
12 years agosome refactoring in prep for dynamic Record Summary layout
Jason Etheridge [Wed, 6 Jul 2011 06:32:01 +0000 (02:32 -0400)]
some refactoring in prep for dynamic Record Summary layout

Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
12 years agoin staff Record Summary (bib brief) pane, stretch the column for title, author, and...
Jason Etheridge [Fri, 1 Jul 2011 16:05:46 +0000 (12:05 -0400)]
in staff Record Summary (bib brief) pane, stretch the column for title, author, and bib call #

Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
12 years agoAddress minor code formatting consistency
Dan Scott [Mon, 18 Jul 2011 15:00:26 +0000 (11:00 -0400)]
Address minor code formatting consistency

The rest of the code has spaces around the conditional clause in an if()
statement, so do likewise here.

Signed-off-by: Dan Scott <dan@coffeecode.net>