working/Evergreen.git
9 years agoChange a few permission levels and assignments
Dan Wells [Wed, 1 Jun 2011 13:43:53 +0000 (09:43 -0400)]
Change a few permission levels and assignments

In an attempt to be consistent with existing perms, a few were moved to
levels lower than 'Consortium', and ADMIN_SERIAL_ITEM is only in the
'Serial' group.

Signed-off-by: Dan Wells <dbw2@calvin.edu>
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
9 years agoPush the grp perm mappings into the seed data
Jason Etheridge [Thu, 26 May 2011 18:31:04 +0000 (14:31 -0400)]
Push the grp perm mappings into the seed data

Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Signed-off-by: Dan Wells <dbw2@calvin.edu>
9 years agowrong group ids for system admin and global admin
Jason Etheridge [Thu, 26 May 2011 16:55:25 +0000 (12:55 -0400)]
wrong group ids for system admin and global admin

Signed-off-by: Dan Wells <dbw2@calvin.edu>
9 years agoput CREATE_PURCHASE_REQUEST into Users, not Staff
Jason Etheridge [Thu, 26 May 2011 16:50:39 +0000 (12:50 -0400)]
put CREATE_PURCHASE_REQUEST into Users, not Staff

Signed-off-by: Dan Wells <dbw2@calvin.edu>
9 years agomap these perms to stock perm groups
Jason Etheridge [Thu, 26 May 2011 16:43:41 +0000 (12:43 -0400)]
map these perms to stock perm groups

Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Signed-off-by: Dan Wells <dbw2@calvin.edu>
9 years agoadded other permissions missing in rel_2_1
Jason Etheridge [Thu, 26 May 2011 14:51:19 +0000 (10:51 -0400)]
added other permissions missing in rel_2_1

Signed-off-by: Dan Wells <dbw2@calvin.edu>
9 years agosome recent cataloging permissions, but I'm unsure about the new upgrade/ script...
Jason Etheridge [Thu, 26 May 2011 07:13:26 +0000 (03:13 -0400)]
some recent cataloging permissions, but I'm unsure about the new upgrade/ script regime

Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Signed-off-by: Dan Wells <dbw2@calvin.edu>
9 years agoMake database schema patch dependencies work more better
Dan Scott [Tue, 31 May 2011 21:30:31 +0000 (17:30 -0400)]
Make database schema patch dependencies work more better

Per a suggestion from Bill Erickson, move evergreen_patch into the
evergreen schema (where we can simply call it evergreen.patch).

Also, as we seem doomed to repeat ourselves, add a little bit of schema
adjustment to the 0526 upgrade script so it can be applied
retroactively.

Signed-off-by: Dan Scott <dscott@laurentian.ca>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
9 years agoMake patch-checking function able to raise a notice
Dan Scott [Tue, 31 May 2011 17:19:08 +0000 (13:19 -0400)]
Make patch-checking function able to raise a notice

There's probably a more elegant way to do this, but basic
testing with the following at least didn't throw an error:

SELECT evergreen.upgrade_deps_block_check('XXXX', NULL);

Also note that the CREATE OR REPLACE function calls will
fail on an existing database due to the changed return
type of the functions - so if this gets moved into its
own upgrade script, DROP FUNCTION calls will be
required.

Signed-off-by: Dan Scott <dscott@laurentian.ca>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
9 years agoRepaired typo on schema and upgrade SQL
Bill Erickson [Tue, 31 May 2011 16:16:16 +0000 (12:16 -0400)]
Repaired typo on schema and upgrade SQL

ARRAY_ACUM is not a defined function.  Per Dan Scott, replaced with
ARRAY_AGG instead of the correctly spelled ARRAY_ACCUM, since we'll be
using that function in place of ARRAY_ACCUM going forward.

Thanks, Dan.

Signed-off-by: Bill Erickson <berick@esilibrary.com>
9 years agoLP#739444 Incrementing opac.dtd copyright date
Michael Peters [Tue, 31 May 2011 12:44:49 +0000 (08:44 -0400)]
LP#739444 Incrementing opac.dtd copyright date

Signed-off-by: Michael Peters <mrpeters@library.in.gov>
Signed-off-by: Dan Scott <dan@coffeecode.net>
9 years agoindicate what date format to use for offline patron registration
Jason Etheridge [Fri, 27 May 2011 17:02:14 +0000 (13:02 -0400)]
indicate what date format to use for offline patron registration

Signed-off-by: Jason Etheridge <jason@esilibrary.com>
9 years agoFix Hold Capture checkin mode
Thomas Berezansky [Fri, 27 May 2011 15:39:53 +0000 (11:39 -0400)]
Fix Hold Capture checkin mode

oils_persist was trumping hardcoded values.
Also, change how checked is set/unset for reliability.

Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
9 years agoPatch suggested by Jason Boyer for LP#788601
Mike Rylander [Thu, 26 May 2011 20:03:39 +0000 (16:03 -0400)]
Patch suggested by Jason Boyer for LP#788601

The <script> tag for the chrome frame message has a misplaced semicolon,
which causes an odd looking display issue in Internet Explorer. I
realize that ideally very few people will be using IE, but even if
they're not interested in a quality browsing experience we should
probably put our best face forward.

Signed-off-by: Mike Rylander <mrylander@gmail.com>
9 years agoDistinguish between 'Show Groups' checkboxes in Serial Control
Dan Wells [Thu, 26 May 2011 15:19:40 +0000 (11:19 -0400)]
Distinguish between 'Show Groups' checkboxes in Serial Control

Two different checkboxes ended up with the same ID, which, as one might
expect, kinda worked and kinda didn't.

Signed-off-by: Dan Wells <dbw2@calvin.edu>
9 years agoMerge branch 'master' of git.evergreen-ils.org:Evergreen
Dan Wells [Thu, 26 May 2011 15:08:21 +0000 (11:08 -0400)]
Merge branch 'master' of git.evergreen-ils.org:Evergreen

9 years agoChecking for 'twisty' leads to false negatives in Serial Control
Dan Wells [Thu, 26 May 2011 14:53:42 +0000 (10:53 -0400)]
Checking for 'twisty' leads to false negatives in Serial Control

Since a tree can be opened with a double-click, we can't rely on 'twisty'
being set to load the child data.

Signed-off-by: Dan Wells <dbw2@calvin.edu>
9 years agoDon't rely on call number column being rendered before prefix/suffix/class columns...
Jason Etheridge [Thu, 26 May 2011 07:55:26 +0000 (03:55 -0400)]
Don't rely on call number column being rendered before prefix/suffix/class columns.  Also, remove prefix/suffix/class from the check-in interface, since those column definitions can make extra network calls and we want that interface to be as fast as possible.

Signed-off-by: Jason Etheridge <jason@esilibrary.com>
9 years agowrong target for parts holds in open-ils.circ.holds.retrieve_all_from_title
Jason Etheridge [Thu, 26 May 2011 06:42:07 +0000 (02:42 -0400)]
wrong target for parts holds in open-ils.circ.holds.retrieve_all_from_title

Signed-off-by: Jason Etheridge <jason@esilibrary.com>
9 years agobrowser.js debugging / robustification. Replace some magic numbers with proper const...
Jason Etheridge [Mon, 23 May 2011 20:14:29 +0000 (16:14 -0400)]
browser.js debugging / robustification.  Replace some magic numbers with proper constants.

Signed-off-by: Jason Etheridge <jason@esilibrary.com>
9 years agodebugging aid, take the "thread trace" for a given page and make it stand out more
Jason Etheridge [Mon, 23 May 2011 18:03:33 +0000 (14:03 -0400)]
debugging aid, take the "thread trace" for a given page and make it stand out more

Signed-off-by: Jason Etheridge <jason@esilibrary.com>
9 years agodebugging aid. split dump output produced by replacement dump function in custom...
Jason Etheridge [Mon, 23 May 2011 19:51:32 +0000 (15:51 -0400)]
debugging aid.  split dump output produced by replacement dump function in custom.js.example

Signed-off-by: Jason Etheridge <jason@esilibrary.com>
9 years agomissed this way back when. fix multiple event override handling (for ilsevent lackin...
Jason Etheridge [Wed, 25 May 2011 20:56:24 +0000 (16:56 -0400)]
missed this way back when.  fix multiple event override handling (for ilsevent lacking events), re: lp#757634.  Also add some missing typeof's

Signed-off-by: Jason Etheridge <jason@esilibrary.com>
9 years agoFix authority linking script typo user/dbs/authlink-830-typo
Dan Scott [Wed, 25 May 2011 15:38:11 +0000 (11:38 -0400)]
Fix authority linking script typo

Problem reported by Ditty Mulder <dmu@iisg.nl>

Signed-off-by: Dan Scott <dan@coffeecode.net>
9 years agoMerge branch 'master' of git.evergreen-ils.org:working/Evergreen into user/dbs/foo134...
Dan Scott [Wed, 25 May 2011 02:49:44 +0000 (22:49 -0400)]
Merge branch 'master' of git.evergreen-ils.org:working/Evergreen into user/dbs/foo13498-29838-ws

9 years agoWhen auto-versioning, use last piece of branch
Thomas Berezansky [Wed, 25 May 2011 02:20:20 +0000 (22:20 -0400)]
When auto-versioning, use last piece of branch

Specifically, last / delimited piece.

Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Dan Scott <dan@coffeecode.net>
9 years agoMerge branch 'master' of git.evergreen-ils.org:Evergreen into user/dbs/lp-787150-ws
Dan Scott [Wed, 25 May 2011 02:33:44 +0000 (22:33 -0400)]
Merge branch 'master' of git.evergreen-ils.org:Evergreen into user/dbs/lp-787150-ws

9 years agotrival whitespace cleanup
Galen Charlton [Wed, 25 May 2011 02:29:39 +0000 (22:29 -0400)]
trival whitespace cleanup

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
9 years agoAdd --nonum to make-db-patch
Thomas Berezansky [Wed, 25 May 2011 02:11:10 +0000 (22:11 -0400)]
Add --nonum to make-db-patch

Makes XXXX.* files.

Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
9 years agoTrivial line-wrapping patch for call number class defaults
Dan Scott [Wed, 25 May 2011 01:56:13 +0000 (21:56 -0400)]
Trivial line-wrapping patch for call number class defaults

Signed-off-by: Dan Scott <dan@coffeecode.net>
9 years agoMake label_class on any new call numbers default to org_unit setting
Dan Wells [Tue, 24 May 2011 14:53:09 +0000 (10:53 -0400)]
Make label_class on any new call numbers default to org_unit setting

Evergreen 2.0 added a label_class column to the call number table with
one major purpose being the generation of correct sort keys. You can
also specify a default label class as an org unit setting. However:

1) There are no interface elements for setting the label class of an
individual call number.

2) The default setting from the actor.org_unit_setting
'cat.default_classification_scheme' value, if set, is not consulted
(that is, not set in the call number table) when new call numbers are
created.

These two facts together greatly reduce the utility of this very
valuable feature, as all new call numbers end up in the 'Generic' class.

While #1 has been addressed in 2.1+, there is still work to be done in
setting this class on import. Also, which interface parts (if any) make
it back to 2.0 is subject to debate.

This commit addresses #2.

See lp #787150.

Signed-off-by: Dan Wells <dbw2@calvin.edu>
Signed-off-by: Dan Scott <dan@coffeecode.net>
9 years agoBring serial.unit in line with asset.copy
Dan Wells [Tue, 24 May 2011 20:55:47 +0000 (16:55 -0400)]
Bring serial.unit in line with asset.copy

Signed-off-by: Dan Wells <dbw2@calvin.edu>
9 years agoremove restriction on resetting pw to random number when Use Phone Password setting...
Jason Etheridge [Tue, 24 May 2011 18:55:57 +0000 (14:55 -0400)]
remove restriction on resetting pw to random number when Use Phone Password setting is active.  uEditMakeRandomPw will still get called for new users, but should get overwritten once a phone number is entered

Signed-off-by: Jason Etheridge <jason@esilibrary.com>
9 years agowrong identifier and lingering copy/paste-o in code for Item Status -> Add Items
Jason Etheridge [Mon, 23 May 2011 15:09:41 +0000 (11:09 -0400)]
wrong identifier and lingering copy/paste-o in code for Item Status -> Add Items

Signed-off-by: Jason Etheridge <jason@esilibrary.com>
9 years agoMerge branch 'master' of git.evergreen-ils.org:Evergreen
Mike Rylander [Mon, 23 May 2011 15:14:41 +0000 (11:14 -0400)]
Merge branch 'master' of git.evergreen-ils.org:Evergreen

9 years agoRevert "Wrap proximity refreshing in a transaction to avoid timespans where there...
Mike Rylander [Mon, 23 May 2011 15:02:56 +0000 (11:02 -0400)]
Revert "Wrap proximity refreshing in a transaction to avoid timespans where there is no such information"

This reverts commit fbfb74639cc2628fb90e56f7dbd0d364e0b7e386.

Signed-off-by: Mike Rylander <mrylander@gmail.com>
9 years agoApply Apache file expiration to the current official Javascript content type
Dan Wells [Mon, 23 May 2011 13:30:43 +0000 (09:30 -0400)]
Apply Apache file expiration to the current official Javascript content type

At least on Ubuntu 10.04, Javascript files are generally delivered with a
Content-Type header of 'application/javascript', not
'application/x-javascript'.  This change applies the much shorter 18 hour
expiration to the affected files, rather than allowing them to default to
1 month.

Signed-off-by: Dan Wells <dbw2@calvin.edu>
9 years agoFix bad seed data in an A/T template
Lebbeous Fogle-Weekley [Fri, 20 May 2011 19:47:04 +0000 (15:47 -0400)]
Fix bad seed data in an A/T template

The action_trigger event def template for printing acq invoices was
syntatically broken.  The collapse filter isn't important per se, but
it balances the extra [% END %] at the bottom of the template, and it
was there originally, and I see no reason not to put it back.

Incidentally, maybe the database upgrade script in the commit will be
the first in master to successfully use the new
evergreen.upgrade_deps_block_check() function ?

Reported by Sally Fortin.

Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
9 years agoRestore the Replace Barcode option in Holdings Maintenance, as the Edit Item menu...
Jason Etheridge [Fri, 20 May 2011 16:45:08 +0000 (12:45 -0400)]
Restore the Replace Barcode option in Holdings Maintenance, as the Edit Item menu will only serve the same duty if the unified volume/copy editor is activated via org setting (otherwise, it's just the Item Attribute Editor).  klussier++ for the catch

Signed-off-by: Jason Etheridge <jason@esilibrary.com>
9 years agoMerge branch 'master' of git.evergreen-ils.org:Evergreen
Dan Wells [Fri, 20 May 2011 15:30:18 +0000 (11:30 -0400)]
Merge branch 'master' of git.evergreen-ils.org:Evergreen

9 years agoFix advanced receive bug in manage_items.js
Dan Wells [Fri, 20 May 2011 15:27:53 +0000 (11:27 -0400)]
Fix advanced receive bug in manage_items.js
Signed-off-by: Dan Wells <dbw2@calvin.edu>
9 years agoalign the batch edit menus in the vol creator. mostly aesthetic, but can save horizo...
Jason Etheridge [Fri, 20 May 2011 09:30:55 +0000 (05:30 -0400)]
align the batch edit menus in the vol creator.  mostly aesthetic, but can save horizontal real estate, so usability as well for horizontal vol/copy editor.

Signed-off-by: Jason Etheridge <jason@esilibrary.com>
9 years agousability tweak for controlling screen real estate, in unified vol/copy editor don...
Jason Etheridge [Fri, 20 May 2011 09:04:17 +0000 (05:04 -0400)]
usability tweak for controlling screen real estate, in unified vol/copy editor don't embed the the Record Summary in the vol editor, but in the main wrapping UI.  Also move CN batch edit bar into groupbox

Signed-off-by: Jason Etheridge <jason@esilibrary.com>
9 years agousability tweak, pull the Create button out of the embedded interfaces and into the...
Jason Etheridge [Fri, 20 May 2011 07:55:37 +0000 (03:55 -0400)]
usability tweak, pull the Create button out of the embedded interfaces and into the wrapping UI for the horizontal variant of the unified vol/copy editor

Signed-off-by: Jason Etheridge <jason@esilibrary.com>
9 years agocss hooks so we can hide class, affix, and part columns in volume creator/editor...
Jason Etheridge [Fri, 20 May 2011 07:33:52 +0000 (03:33 -0400)]
css hooks so we can hide class, affix, and part columns in volume creator/editor.  can help with screen real estate with the horizontal vol/copy editor

Signed-off-by: Jason Etheridge <jason@esilibrary.com>
9 years agousability tweak, spread the template bar across the top of both panes for the horizon...
Jason Etheridge [Fri, 20 May 2011 06:59:31 +0000 (02:59 -0400)]
usability tweak, spread the template bar across the top of both panes for the horizontal unified vol/copy creator/editor

Signed-off-by: Jason Etheridge <jason@esilibrary.com>
9 years agoFix a problem with open-ils.circ.holds.retrieve_all_from_title user/senator/fix-all-rec-holds
Lebbeous Fogle-Weekley [Fri, 20 May 2011 14:17:05 +0000 (10:17 -0400)]
Fix a problem with open-ils.circ.holds.retrieve_all_from_title

Anoop Atre spotted this bug that's triggered by selecting "View Holds"
from "Actions for Selected Record" in the catalog seen through the staff
client.

Said method would error out like this:

[2011-05-20 10:04:03] open-ils.circ [ERR
:31866:CStoreEditor.pm:109:13058333633194115] editor[0|1] request error
open-ils.cstore.direct.serial.issuance.id_list.atomic :
{"subscription":[]} : Exception:
OpenSRF::DomainObject::oilsMethodException 2011-05-20T10:04:03
OpenILS::Utils::CStoreEditor
/openils/lib/perl5/OpenILS/Utils/CStoreEditor.pm:412 <500>  Severe query
error -- see error log for more details

because when trying to gather issuance-type holds, it didn't properly test
whether there actually were any subscriptions and issuances related to
the bib record in question.

Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
9 years agoRevert "When placing holds on a bib with monographic part, require selection of a...
Mike Rylander [Fri, 20 May 2011 13:12:22 +0000 (09:12 -0400)]
Revert "When placing holds on a bib with monographic part, require selection of a specific part"

This reverts commit 3e63a898c53f6100d678f263e5dde5b9f678692d.

We must not force P-type holds as not all copies may not use parts.  Imagine a situation where
only one library breaks up a season of Seinfeld by using a part per DVD, and all others leave
them bound and therefore need no part designations.

Signed-off-by: Mike Rylander <mrylander@gmail.com>
9 years agoWhen placing holds on a bib with monographic part, require selection of a specific...
Jason Etheridge [Fri, 20 May 2011 06:40:24 +0000 (02:40 -0400)]
When placing holds on a bib with monographic part, require selection of a specific part

Signed-off-by: Jason Etheridge <jason@esilibrary.com>
9 years agoorder any monograph parts by sort key when placing holds
Jason Etheridge [Fri, 20 May 2011 02:54:30 +0000 (22:54 -0400)]
order any monograph parts by sort key when placing holds

Signed-off-by: Jason Etheridge <jason@esilibrary.com>
9 years agoCN prefix/suffix columns in xul-based hold interfaces
Jason Etheridge [Fri, 20 May 2011 02:25:16 +0000 (22:25 -0400)]
CN prefix/suffix columns in xul-based hold interfaces

Signed-off-by: Jason Etheridge <jason@esilibrary.com>
9 years agolabel consistency in vol/item creator
Jason Etheridge [Fri, 20 May 2011 01:24:24 +0000 (21:24 -0400)]
label consistency in vol/item creator

Signed-off-by: Jason Etheridge <jason@esilibrary.com>
9 years agoadd missing upgrade step to create staging schema
Galen Charlton [Fri, 20 May 2011 01:28:50 +0000 (21:28 -0400)]
add missing upgrade step to create staging schema

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
9 years agoThe term "foreign" has undesirable implied meaning, so we will dub these "conjoined"
Mike Rylander [Thu, 19 May 2011 16:56:57 +0000 (12:56 -0400)]
The term "foreign" has undesirable implied meaning, so we will dub these "conjoined"

Signed-off-by: Mike Rylander <mrylander@gmail.com>
9 years agoMerge branch 'user/senator/lp-784062' of git.evergreen-ils.org:working/Evergreen
Lebbeous Fogle-Weekley [Thu, 19 May 2011 14:49:44 +0000 (10:49 -0400)]
Merge branch 'user/senator/lp-784062' of git.evergreen-ils.org:working/Evergreen

9 years agoMake DATE_FORMAT macro check inputs
Thomas Berezansky [Thu, 19 May 2011 12:51:47 +0000 (08:51 -0400)]
Make DATE_FORMAT macro check inputs

Specifically, if no date and no format (empty replaces?) replace with empty string.

Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
9 years agoAdd Shelf Expire Time to hold slip, date formatter
Thomas Berezansky [Wed, 18 May 2011 23:12:42 +0000 (19:12 -0400)]
Add Shelf Expire Time to hold slip, date formatter

Date formatter would work like so:
%DATE_FORMAT(date,format)%

For example:
%DATE_FORMAT(%shelf_expire_time%,%m/%d)%

Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
9 years agoAdd permission checking for updating and deleting volumes. user/senator/lp-784062
Lebbeous Fogle-Weekley [Wed, 18 May 2011 21:26:58 +0000 (17:26 -0400)]
Add permission checking for updating and deleting volumes.

This addresses LP #784062 reported by Ben Shum, and I think others?

Creating volumes was already covered.  The ability to delete volumes
without permission would be less often an issue in practice since you
would need permission to delete the volume's copies before you could
delete the volume itself.

Anyway, this should square things.

Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
9 years agotrival whitespace changes
Galen Charlton [Wed, 18 May 2011 20:36:10 +0000 (16:36 -0400)]
trival whitespace changes

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
9 years agoprovide hint to sysadmin if memcached issue is preventing auth
Galen Charlton [Wed, 18 May 2011 18:05:51 +0000 (14:05 -0400)]
provide hint to sysadmin if memcached issue is preventing auth

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Dan Scott <dan@coffeecode.net>
9 years agoMake Perl 'make check' work without 'make all'
Dan Scott [Wed, 18 May 2011 17:18:14 +0000 (13:18 -0400)]
Make Perl 'make check' work without 'make all'

Factor the build of Build from Build.PL into its own
make target and then make that target a prereq for the
other make targets so that we make Build from Build.PL
when we build Makefile from Makefile.am and run 'make check'

Clear?

Signed-off-by: Dan Scott <dscott@laurentian.ca>
9 years agoWe need to update config.upgrade_log
Mike Rylander [Wed, 18 May 2011 16:39:31 +0000 (12:39 -0400)]
We need to update config.upgrade_log

Signed-off-by: Mike Rylander <mrylander@gmail.com>
9 years agoRecord the current upgrade version number in the baseline schema
Mike Rylander [Wed, 18 May 2011 16:26:53 +0000 (12:26 -0400)]
Record the current upgrade version number in the baseline schema

Signed-off-by: Mike Rylander <mrylander@gmail.com>
9 years agoFix the definition of some of the tracking functions
Mike Rylander [Wed, 18 May 2011 15:33:07 +0000 (11:33 -0400)]
Fix the definition of some of the tracking functions

Signed-off-by: Mike Rylander <mrylander@gmail.com>
9 years agoavoid error when generating fines on checkin
Galen Charlton [Wed, 18 May 2011 15:13:16 +0000 (11:13 -0400)]
avoid error when generating fines on checkin

Prevents "No active transaction to commit" error when checking
in overdue loans.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
9 years agoLet's have this upgrade script not use that upgrade_deps_block_check()...
senator [Wed, 18 May 2011 14:17:16 +0000 (10:17 -0400)]
Let's have this upgrade script not use that upgrade_deps_block_check()...

...function quite yet

9 years agouse correct name of upgrade check function
Galen Charlton [Wed, 18 May 2011 14:51:20 +0000 (10:51 -0400)]
use correct name of upgrade check function

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
9 years agoMore make-db-patch goodness: wrap existing
Thomas Berezansky [Wed, 18 May 2011 12:21:53 +0000 (08:21 -0400)]
More make-db-patch goodness: wrap existing

--wrap option will take an existing file and wrap it properly.
When --wrap is specified --from is ignored.

Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
9 years agofix CN prefix/suffix display in XUL interfaces so we can handle any affix we come...
Jason Etheridge [Wed, 18 May 2011 06:14:52 +0000 (02:14 -0400)]
fix CN prefix/suffix display in XUL interfaces so we can handle any affix we come across

Signed-off-by: Jason Etheridge <jason@esilibrary.com>
9 years agoInclude call number prefix/suffix in display and sorting of holds for Print Full...
Jason Etheridge [Wed, 18 May 2011 05:05:17 +0000 (01:05 -0400)]
Include call number prefix/suffix in display and sorting of holds for Print Full Pull List (Alternate strategy).  Also fix things so that we're sorting on the label_sortkey for call number, and not the label.  So, for this interface, the hard-wired sort order is Copy Location Order (as defined by Admin -> Local Administration -> Copy Location Order), Call Number Prefix, Call Number Label, Call Number Suffix, and Hold Request time.

Signed-off-by: Jason Etheridge <jason@esilibrary.com>
9 years agohave the call number checkbox for pocket labels include prefix/suffix. A %call_numbe...
Jason Etheridge [Wed, 18 May 2011 02:27:07 +0000 (22:27 -0400)]
have the call number checkbox for pocket labels include prefix/suffix.  A %call_number% macro is still available for the bare call number label without affixes

Signed-off-by: Jason Etheridge <jason@esilibrary.com>
9 years agoCan't use encodeURI and decodeURI for everything with persist_helper (in particular...
Jason Etheridge [Wed, 18 May 2011 02:24:21 +0000 (22:24 -0400)]
Can't use encodeURI and decodeURI for everything with persist_helper (in particular, something like "%macro1% %macro2%" as a custom entry in the label interface), so try/catch them and fall back to the original behavior.

Signed-off-by: Jason Etheridge <jason@esilibrary.com>
9 years agoonly use the label to initialize call number browse
Galen Charlton [Tue, 17 May 2011 22:06:38 +0000 (18:06 -0400)]
only use the label to initialize call number browse

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
9 years agoadd a bit of context to upgrade SQL hints
Galen Charlton [Tue, 17 May 2011 19:09:51 +0000 (15:09 -0400)]
add a bit of context to upgrade SQL hints

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
9 years agoImprovements to make-db-patch.pl
Thomas Berezansky [Tue, 17 May 2011 17:50:44 +0000 (13:50 -0400)]
Improvements to make-db-patch.pl

Grab all changes to base sql files into the upgrade script
Based on HEAD (uncommitted changes) or --from=refspec

Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
9 years agoConvert/move SQL script for Lazy Circ
Mike Rylander [Tue, 17 May 2011 17:44:35 +0000 (13:44 -0400)]
Convert/move SQL script for Lazy Circ

Signed-off-by: Mike Rylander <mrylander@gmail.com>
9 years agoLazy Circ (AKA partial barcode lookup)
Thomas Berezansky [Fri, 13 May 2011 19:43:52 +0000 (15:43 -0400)]
Lazy Circ (AKA partial barcode lookup)

Database tables/access functions for prefix/suffix info

    Table: config.barcode_completion

    Function: evergreen.get_barcodes
        Takes org unit, context, and input barcode
        Context is a string and can contain:
            asset - asset.copy barcodes
            serial - serial.unit barcodes
            actor - actor.usr (via actor.card) barcodes
            booking - booking.resource barcodes
        Special case: asset and serial both in context
            Returns non-serial asset entries as asset
            Returns serial entries as serial
    Type for function return: evergreen.barcode_set

    With editing interface: Admin->Local Admin->Barcode Completion

    OpenSRF Call: open-ils.actor.get_barcodes
        Basically a passthrough to the database function
        Checks for permissions:
            STAFF_LOGIN - To do anything
            VIEW_USER - At home_ou of the user owning the returned
                        barcode when in actor context

Add get_barcode to menu.js and to xulG in a number of places
    Takes a window handle, a context, and an input barcode
    Passes the current OU, the context, and the input barcode to the db
    If multiple results come back it pops up a dialog
    Returns boolean false on no results
    Returns "user_false" on dialog cancel
    Returns an object with type, id, barcode on success
    If dialog was brought up, returns data used to populate button

Add option for looking up actors at checkout
    Org unit setting: Load patron from Checkout. Default: Don't.

Call sites for get_barcode:
    Lookup Patron By Barcode (actor only)
    OPAC's Staff Client Place Hold (actor only)
    Checkout (asset only by default, with actor if above option set)
    Checkin (asset only)
    Item Status (asset only)

Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
9 years agoLP#783486: Improve authority lookup performance
Dan Scott [Tue, 17 May 2011 04:29:47 +0000 (00:29 -0400)]
LP#783486: Improve authority lookup performance

Testing showed that the two indexes added herein improve
authority lookup performance radically; on a 16 GB RAM
database server with 1.1M records, lookup times decreased
from 5500 ms to 0.223 ms. Recommended, would EXPLAIN ANALYZE
again.

Signed-off-by: Dan Scott <dan@coffeecode.net>
9 years agostop hold permit check from crashing if age protection in effect
Galen Charlton [Tue, 17 May 2011 04:40:02 +0000 (00:40 -0400)]
stop hold permit check from crashing if age protection in effect

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
9 years agoIgnore "deleted" authority records when using the tag-validation method
Mike Rylander [Mon, 16 May 2011 22:17:30 +0000 (18:17 -0400)]
Ignore "deleted" authority records when using the tag-validation method

Signed-off-by: Mike Rylander <mrylander@gmail.com>
9 years agoBorrow on_or_after() from MFHD/Caption.pm in MFHD/Date.pm
Dan Wells [Mon, 16 May 2011 19:23:10 +0000 (15:23 -0400)]
Borrow on_or_after() from MFHD/Caption.pm in MFHD/Date.pm

Signed-off-by: Dan Wells <dbw2@calvin.edu>
9 years agoMerge branch 'master' of git.evergreen-ils.org:Evergreen
Galen Charlton [Mon, 16 May 2011 17:29:32 +0000 (13:29 -0400)]
Merge branch 'master' of git.evergreen-ils.org:Evergreen

9 years agostandardize name of 2.0-2.1 upgrade script
Galen Charlton [Mon, 16 May 2011 17:29:10 +0000 (13:29 -0400)]
standardize name of 2.0-2.1 upgrade script

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
9 years agopersist partial changes to new copies in vol/copy editor has new copies are gathered.
Jason Etheridge [Mon, 16 May 2011 16:12:40 +0000 (12:12 -0400)]
persist partial changes to new copies in vol/copy editor has new copies are gathered.

In other words, you can do something like enter 5 in the "# of Copies" field, enter the first barcode (say b1), edit an attribute (say, set Circulate = No), and then enter a second barcode (b2).  Previously, the changes made to b1 would be lost as b2 was entered (or as other movement around the barcode entry textboxes happened) and both copies would get a Circulate = Yes, but now in this scenario, you would see 1 copy set to No and 1 copy set to Yes for the Circulate attribute.

Signed-off-by: Jason Etheridge <jason@esilibrary.com>
9 years agosimpler language, and the behavior of this action is configurable
Jason Etheridge [Mon, 16 May 2011 15:56:58 +0000 (11:56 -0400)]
simpler language, and the behavior of this action is configurable

Signed-off-by: Jason Etheridge <jason@esilibrary.com>
9 years agofirst pass at 2.0 to 2.1 upgrade script
Galen Charlton [Mon, 16 May 2011 15:33:42 +0000 (11:33 -0400)]
first pass at 2.0 to 2.1 upgrade script

Tested so far on an upgrade from 2.0.1; goes up
to DB patch 0533.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
9 years agousability tweak
Jason Etheridge [Sun, 15 May 2011 20:35:05 +0000 (16:35 -0400)]
usability tweak

Signed-off-by: Jason Etheridge <jason@esilibrary.com>
9 years agodefault the label class according to library setting during vol creation
Jason Etheridge [Sun, 15 May 2011 20:15:30 +0000 (16:15 -0400)]
default the label class according to library setting during vol creation

Signed-off-by: Jason Etheridge <jason@esilibrary.com>
9 years agoremove this comment, testing the repo & email
Jason Etheridge [Sun, 15 May 2011 20:02:32 +0000 (16:02 -0400)]
remove this comment, testing the repo & email

9 years agoNuke one more Trunk reference: windowssetup.nsi
Thomas Berezansky [Sat, 14 May 2011 22:22:01 +0000 (18:22 -0400)]
Nuke one more Trunk reference: windowssetup.nsi

Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
9 years agoMore SVN to Git rigging
Thomas Berezansky [Sat, 14 May 2011 19:57:27 +0000 (15:57 -0400)]
More SVN to Git rigging

Staff client Makefile can no longer build based on SVN.

Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
9 years agoremove references to SVN now that we're using Git
Galen Charlton [Sat, 14 May 2011 20:19:36 +0000 (16:19 -0400)]
remove references to SVN now that we're using Git

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
9 years agoTrivial whitespace change
Galen Charlton [Sat, 14 May 2011 19:39:03 +0000 (15:39 -0400)]
Trivial whitespace change

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
9 years agoadd missing update script for change to circ age stored procedure
gmc [Fri, 13 May 2011 20:57:59 +0000 (20:57 +0000)]
add missing update script for change to circ age stored procedure

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
git-svn-id: svn://svn.open-ils.org/ILS/trunk@20475 dcc99617-32d9-48b4-a31d-7c20da2025e4

9 years agoPatch from Ben Ostrowsky (LP#782268) to simplify seed/example permission setup and...
miker [Fri, 13 May 2011 17:30:47 +0000 (17:30 +0000)]
Patch from Ben Ostrowsky (LP#782268) to simplify seed/example permission setup and move one step towards being able to rid ourselves of permission.perm_list.id

git-svn-id: svn://svn.open-ils.org/ILS/trunk@20473 dcc99617-32d9-48b4-a31d-7c20da2025e4

9 years agoA bevy of MFHD bug fixes (and test cases)
dbwells [Fri, 13 May 2011 16:01:04 +0000 (16:01 +0000)]
A bevy of MFHD bug fixes (and test cases)

1) Remove hard-coded 'gap' text from format_part()
2) Honor $ypm## for chron_to_date() for annuals
3) Removed overly simple check on $w as digit
4) Allow for combined chronologies other than 2nd level
5) Make calendar changes trump $u counts
6) Honor issue restarts at calendar changes
7) Rudimentary support of $u counts for non-restarting issue numbering
8) Special interpretation of $yps for early winters (i.e. winter is the first season of the calendar year)
9) Teach chron_to_date() about early winters

The last two points deserve some special attention.  A large number of journals consider 'Winter' to be the first season of the year, so Winter 2011 means (roughly) January 2011, not December 2011.  However, there is no explicit way to indicate this in the standard, and also the code relies in many ways on the fact that 24 (chronology code for winter) is greater than 21 (code for spring).  To work around this, we are interpreting a certain ambiguous pattern in a particular way.  Specifically, if you set $w to a digit, then set $y to 'ps24,21,22,23' (or some variation with '24' as the first value), you will get this winter-first behavior.  Also, the season is treated internally as '20' then converted to '24' when processing is completed.

git-svn-id: svn://svn.open-ils.org/ILS/trunk@20470 dcc99617-32d9-48b4-a31d-7c20da2025e4

9 years agofix query in various copy count functions
gmc [Fri, 13 May 2011 15:41:10 +0000 (15:41 +0000)]
fix query in various copy count functions

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
git-svn-id: svn://svn.open-ils.org/ILS/trunk@20468 dcc99617-32d9-48b4-a31d-7c20da2025e4

9 years agofor upgrade, let prefix and suffix in audit be null
gmc [Fri, 13 May 2011 13:25:27 +0000 (13:25 +0000)]
for upgrade, let prefix and suffix in audit be null

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
git-svn-id: svn://svn.open-ils.org/ILS/trunk@20466 dcc99617-32d9-48b4-a31d-7c20da2025e4

9 years agoadd affix columns to acn auditor table
gmc [Fri, 13 May 2011 13:07:59 +0000 (13:07 +0000)]
add affix columns to acn auditor table

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
git-svn-id: svn://svn.open-ils.org/ILS/trunk@20464 dcc99617-32d9-48b4-a31d-7c20da2025e4

9 years agoPatch from James Fournie addressing LP#781803: Multiple renewal fails on MAX_FINES...
miker [Thu, 12 May 2011 19:50:55 +0000 (19:50 +0000)]
Patch from James Fournie addressing LP#781803: Multiple renewal fails on MAX_FINES circs

git-svn-id: svn://svn.open-ils.org/ILS/trunk@20461 dcc99617-32d9-48b4-a31d-7c20da2025e4