Lebbeous Fogle-Weekley [Wed, 3 Aug 2011 20:42:17 +0000 (16:42 -0400)]
Cast needed
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Mike Rylander [Wed, 3 Aug 2011 00:05:53 +0000 (20:05 -0400)]
Quote container id param for safety
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Mike Rylander [Wed, 3 Aug 2011 00:02:28 +0000 (20:02 -0400)]
Merge branch 'QP_bucket_filter' of git.evergreen-ils.org:evergreen/equinox into QP_bucket_filter
Mike Rylander [Wed, 3 Aug 2011 00:01:49 +0000 (20:01 -0400)]
Merge branch 'master' of git.evergreen-ils.org:Evergreen into QP_bucket_filter
Lebbeous Fogle-Weekley [Tue, 2 Aug 2011 21:34:10 +0000 (17:34 -0400)]
Fixed some syntax errors, but getting no results when I'd expect some
I searched with this
container(bre,bookbag,12,$authtoken)
where $authtoken is substituted with an actual live authtoken for the
user that owns that container, and here is the example generated query
that returns no results:
SELECT * FROM search.query_parser_fts(
4::INT,
2::INT,
$core_query_3553$SELECT m.source AS id,
ARRAY_ACCUM(DISTINCT m.source) AS records,
1.0/((AVG(
(1)
) * COALESCE( NULLIF( FIRST(mrd.attrs @> hstore('item_lang', $_3553$eng$_3553$)), FALSE )::INT * 5, 1)))::NUMERIC AS rel,
1.0/((AVG(
(1)
) * COALESCE( NULLIF( FIRST(mrd.attrs @> hstore('item_lang', $_3553$eng$_3553$)), FALSE )::INT * 5, 1)))::NUMERIC AS rank,
FIRST(mrd.attrs->'date1') AS tie_break
FROM metabib.metarecord_source_map m
JOIN metabib.record_attr mrd ON (m.source = mrd.id)
JOIN ( SELECT ci.target_biblio_record_entry AS container_item
FROM container.biblio_record_entry_bucket_item ci
JOIN container.biblio_record_entry_bucket c ON (c.id = ci.bucket)
WHERE c.btype = $_3553$bookbag$_3553$ AND c.id = 12
AND (c.pub IS TRUE OR c.owner = 1)) container ON (container.container_item = mrd.id)
WHERE 1=1
AND (TRUE)
GROUP BY 1
ORDER BY 4 ASC NULLS LAST, 5 DESC NULLS LAST, 3 DESC
LIMIT 10000
$core_query_3553$::TEXT,
$${}$$::INT[],
$${}$$::INT[],
NULL::INT,
1000::INT,
10000::INT,
'f'::BOOL,
't'::BOOL
);
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Joseph Lewis [Tue, 2 Aug 2011 20:41:37 +0000 (14:41 -0600)]
Remove craftsman skin.
Signed-off-by: Joseph Lewis <joehms22@gmail.com>
Via LP:
https://bugs.launchpad.net/evergreen/+bug/820010
And this email thread:
http://libmail.georgialibraries.org/pipermail/open-ils-dev/2010-August/006269.html
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Mike Rylander [Tue, 2 Aug 2011 19:01:55 +0000 (15:01 -0400)]
Merge branch 'QP_bucket_filter' of git.evergreen-ils.org:evergreen/equinox into QP_bucket_filter
Mike Rylander [Tue, 2 Aug 2011 18:58:57 +0000 (14:58 -0400)]
Actually JOIN the VALUES list; syntax copy/paste-o; use the correct field for bre containers
Signed-off-by: Mike Rylander <mrylander@gmail.com>
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>
Mike Rylander [Tue, 2 Aug 2011 18:58:57 +0000 (14:58 -0400)]
Actually JOIN the VALUES list; syntax copy/paste-o; use the correct field for bre containers
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Mike Rylander [Tue, 2 Aug 2011 18:39:18 +0000 (14:39 -0400)]
Merge branch 'master' of git.evergreen-ils.org:Evergreen into QP_bucket_filter
Galen Charlton [Tue, 2 Aug 2011 16:20:32 +0000 (12:20 -0400)]
lp758945: make receipt template macros repeatable
Patch from Jason Boyer to allow macros to be used
more than once in a section; prior to this patch, only
the first occurrence was replaced with the substitation
value.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Thomas Berezansky [Tue, 2 Aug 2011 16:09:33 +0000 (12:09 -0400)]
Merge branch 'master' of git://git.evergreen-ils.org/Evergreen
Dan Scott [Sun, 24 Jul 2011 19:51:38 +0000 (15:51 -0400)]
Format an unordered list appropriately
The list of developer prereqs was munged inline rather than as a list.
Signed-off-by: Dan Scott <dan@coffeecode.net>
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Dan Scott [Thu, 21 Jul 2011 22:39:06 +0000 (18:39 -0400)]
Provide Fedora-friendly instructions for the DBD libraries
We had only provided the Debian / Ubuntu location of the libdbi-libdbd
libraries, so add the Fedora location as well.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Dan Scott [Thu, 21 Jul 2011 22:35:17 +0000 (18:35 -0400)]
Bring more of the wiki docs over to the README
Document Perl prerequisites for a standalone PostgreSQL server.
Include a section on starting Evergreen and basic troubleshooting.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Dan Scott [Thu, 21 Jul 2011 21:39:49 +0000 (17:39 -0400)]
Update the README to include database installation instructions
A long time ago, the database server was installed by default.
Nowadays, installing the database server is a separate step
reserved for whatever machine you want to devote to PostgreSQL.
Not that you can't put it on the same machine as the rest of
Evergreen and OpenSRF...
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Bill Erickson [Tue, 2 Aug 2011 15:49:03 +0000 (11:49 -0400)]
Fixed typo in vandelay UI
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Bill Erickson [Tue, 2 Aug 2011 15:31:24 +0000 (11:31 -0400)]
Merge branch 'master' of git.evergreen-ils.org:Evergreen
Bill Erickson [Tue, 2 Aug 2011 15:26:19 +0000 (11:26 -0400)]
Stamped upgrade script for user/miker/replace_field_fix
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Mike Rylander [Tue, 2 Aug 2011 14:55:00 +0000 (10:55 -0400)]
Have replace_field return input XML when no replace rule is provided
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Lebbeous Fogle-Weekley [Tue, 2 Aug 2011 15:28:01 +0000 (11:28 -0400)]
Merge branch 'rec_attr_def_config_avoid_cxt_fetch'
Bill Erickson [Mon, 1 Aug 2011 18:09:23 +0000 (14:09 -0400)]
Avoid xml_transform retrieval in record attr def editor
config.xml_transform stores large chunks of XML. Fetching it angers
Ejabberd on my test system. All we need is the name, so use the new
AutoFieldWidget.searchOptions param to do just that.
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Thomas Berezansky [Tue, 2 Aug 2011 15:11:26 +0000 (11:11 -0400)]
Add the new patron retrieval to the toolbar
Specifically, in the little list of things that shows up when you use the arrow next to patron search.
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Jason Etheridge [Sun, 31 Jul 2011 04:42:05 +0000 (00:42 -0400)]
Label tweaks re: Database ID vs Record ID, etc.
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Jason Etheridge [Sun, 31 Jul 2011 04:33:31 +0000 (00:33 -0400)]
Add "Retrieve patron via Database ID" menu entry
Add "Retrieve patron via Database ID" menu entry to top-level Search menu
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Jason Etheridge [Thu, 14 Jul 2011 21:21:52 +0000 (17:21 -0400)]
calculate penalties when letting Mark Item Damaged add bills
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Thomas Berezansky [Tue, 2 Aug 2011 13:37:24 +0000 (09:37 -0400)]
Fix oils_i18n_gettext id numbers
config.metabib_field ids 29/30 had 28 for translation id.
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Bill Erickson [Mon, 1 Aug 2011 18:04:24 +0000 (14:04 -0400)]
AutoFieldWidget support for augmenting pcrud search options
Adds a new searchOptions attribute to AutoFieldWidget for specifying
additional parameters to pcrud when retrieving linked objects. The
initial use case is for supporting a "select" list to allow
AutoFieldWidget to retrieve only the display column of a linked object
and not the whole object.
Example:
// fetch 'remote_field_name' on the remote objects instead of
// fetching the entire object
myGrid.overrideWidgetArgs.some_field = {searchOptions :
{"select":{"some_hint":["remote_field_name"]}}};
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Jason Etheridge [Sun, 31 Jul 2011 05:08:07 +0000 (01:08 -0400)]
use isNaN here, since NaN == NaN => false
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
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>
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>
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>
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>
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>
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>
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.
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
Lebbeous Fogle-Weekley [Mon, 25 Jul 2011 19:08:48 +0000 (15:08 -0400)]
Merge branch 'acq-copies-li-summary-etc'
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>
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>
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>
Lebbeous Fogle-Weekley [Mon, 25 Jul 2011 16:14:01 +0000 (12:14 -0400)]
Merge branch 'xul_date_sort'
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>
Lebbeous Fogle-Weekley [Mon, 25 Jul 2011 15:55:36 +0000 (11:55 -0400)]
Merge branch 'parts-hold-warning-fix'
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>
Lebbeous Fogle-Weekley [Mon, 25 Jul 2011 15:45:44 +0000 (11:45 -0400)]
Merge branch 'sound_of_checkin'
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>
Lebbeous Fogle-Weekley [Mon, 25 Jul 2011 15:24:38 +0000 (11:24 -0400)]
Merge branch 'hold_queue_position_sorting'
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>
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>
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>
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>
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>
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>
Lebbeous Fogle-Weekley [Tue, 19 Jul 2011 21:04:38 +0000 (17:04 -0400)]
Merge branch 'master' of git://git.evergreen-ils.org/Evergreen
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>
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>
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>
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>
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>
Jason Etheridge [Mon, 18 Jul 2011 20:24:30 +0000 (16:24 -0400)]
bump xulrunner version
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
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>
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>
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>
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>
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>
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>
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>
James Fournie [Mon, 6 Jun 2011 17:00:22 +0000 (10:00 -0700)]
Spine label editor assumes LC as reported in LP #780665.
This patch encapsulates the LC-assuming code in an IF block which
considers the asset.call_number.volume.label_class. If that is equal to
3, it will use the LC formatting.
Signed-off-by: James Fournie <jfournie@sitka.bclibraries.ca>
Signed-off-by: Dan Scott <dan@coffeecode.net>
Jason Etheridge [Thu, 14 Jul 2011 20:03:42 +0000 (16:03 -0400)]
fix bill ui display update bug where total owed and total checked were not updated if the total owed as paid off in full
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Mike Rylander [Sat, 16 Jul 2011 16:56:32 +0000 (12:56 -0400)]
Stamping upgrade script for "Bad join condition all_circulation view"
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Mike Rylander [Sat, 16 Jul 2011 16:53:13 +0000 (12:53 -0400)]
Bad join condition in secondary (physical) address lookup, causing terrible performance of circ aging
Signed-off-by: Mike Rylander <mrylander@gmail.com>
mrpeters-isl [Wed, 13 Jul 2011 13:42:54 +0000 (09:42 -0400)]
LP795032 Fix cursor rendering and dropdown position in holdings maintenance OU dropdown
Signed-off-by: mrpeters-isl <mrpeters@library.in.gov>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Mike Rylander [Sat, 16 Jul 2011 14:25:44 +0000 (10:25 -0400)]
Stamping upgrade script for "Opac Renewal at original circ library"
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Mike Rylander [Sat, 16 Jul 2011 14:22:51 +0000 (10:22 -0400)]
Default to existing behaviour for the new circ-behaviour global flag
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Thomas Berezansky [Tue, 5 Jul 2011 20:33:41 +0000 (16:33 -0400)]
Cache global flag at first use
This way only the first opac renewal per backend has to ask the database for the global flag.
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Thomas Berezansky [Tue, 5 Jul 2011 16:15:19 +0000 (12:15 -0400)]
Unwrapped upgrade script
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Thomas Berezansky [Sat, 2 Jul 2011 16:50:36 +0000 (12:50 -0400)]
Opac Renewal at original circ library
Fixes multiple potential issues:
1 - Bad home ou on patron breaks circ rules
Ex. Patron edited while editor would let you pick bad home ou
2 - Item not allowed to circ at patron home ou
Ex. Patron went to where they were allowed to pick it up
3 - Fines change to patron home ou fine rules
Ex. Patron's home ou doesn't charge fines but circ lib does
Ex. Circ lib doesn't charge fines but Patron's home ou does
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Mike Rylander [Sat, 16 Jul 2011 14:08:03 +0000 (10:08 -0400)]
Stamping upgrade script for "Prevent OU loops at DB level"
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Thomas Berezansky [Thu, 16 Jun 2011 02:03:47 +0000 (22:03 -0400)]
Unwrapped upgrade script for ou loop protect
May need to be split into "create function" and "add trigger" pieces.
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Thomas Berezansky [Thu, 16 Jun 2011 02:03:38 +0000 (22:03 -0400)]
Prevent OU loops at DB level
Database trigger to prevent actor.org_unit from being parent of self
Actually detects any loops, even those above the current point
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Mike Rylander <mrylander@gmail.com>