Jason Etheridge [Wed, 15 Jun 2011 07:13:50 +0000 (03:13 -0400)]
lp797321: Disable the Apply Payment button during payment processing to mitigate chance of duplicate payments.
I can't actually reproduce the creation of duplicate payments locally with
trunk/2.x, but there are reports of it, and this doesn't seem to hurt. Not
a complete solution, but better than before
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Dan Scott [Tue, 14 Jun 2011 02:54:27 +0000 (22:54 -0400)]
Resolve Squeeze installation problems with PostgreSQL 9.0
When you install OpenSRF on Debian Squeeze, one of the packages
(apache2-prefork-dev) installs 8.4 versions of libpq5 and libpq-dev as
dependencies. These conflict with the 9.0 versions that are required as
dependencies for PostgreSQL 9.0 - so get them out of the way, pin the
9.0 versions of the packages, and reinstall apache2-prefork-dev.
We will probably need to do something similar for Lucid.
Signed-off-by: Dan Scott <dan@coffeecode.net>
Lebbeous Fogle-Weekley [Mon, 13 Jun 2011 20:40:07 +0000 (16:40 -0400)]
Fix a serial batch receive problem reported by Sally Fortin
That prevents receiving items when not using units in some cases.
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Signed-off-by: Dan Wells <dbw2@calvin.edu>
Dan Scott [Mon, 13 Jun 2011 19:34:03 +0000 (15:34 -0400)]
Set a more generous AC timeout value
A timeout value of 1 second is a bit too tight for many added content
providers; set the default to 30 seconds to avoid too many artificial
timeouts.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Wells [Tue, 7 Jun 2011 16:06:57 +0000 (12:06 -0400)]
Support for required fields in Serial Control editors
Adds a basic check for any fields marked as 'required', and alerts and
prevents submitting if they are blank.
Signed-off-by: Dan Wells <dbw2@calvin.edu>
Jason Etheridge [Mon, 13 Jun 2011 18:25:48 +0000 (14:25 -0400)]
clearer label for not charging last patron when marking an item damaged
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Galen Charlton [Mon, 13 Jun 2011 14:42:25 +0000 (10:42 -0400)]
updated favicon to match staff client logo
Favicon created by Michael Peters <mrpeters@library.in.gov>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Dan Scott <dan@coffeecode.net>
Mike Rylander [Mon, 13 Jun 2011 15:00:36 +0000 (11:00 -0400)]
Typo, we need commas
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Mike Rylander [Mon, 13 Jun 2011 14:43:55 +0000 (10:43 -0400)]
Backporting
36b0a67a4520151082e72056893d92ad3bf797f1, in-db unAPI improvement
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Jason Etheridge [Mon, 13 Jun 2011 14:41:18 +0000 (10:41 -0400)]
more s/Foreign/Conjoined/ Items label changes
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Jason Etheridge [Mon, 13 Jun 2011 14:36:10 +0000 (10:36 -0400)]
Merge branch 'rel_2_1' of git.evergreen-ils.org:Evergreen into rel_2_1
Jason Etheridge [Mon, 13 Jun 2011 14:35:29 +0000 (10:35 -0400)]
change accesskeys/labels for menu entries related to Conjoined Items
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Dan Scott [Tue, 31 May 2011 17:55:29 +0000 (13:55 -0400)]
Remove all references to Cookie(s).js and Cookies.js
Dojo toolkit is the new Cookie manager, so any lingering
references to Cookie.js (a typo in any case) are no longer
valid, and we no longer need to ship Cookies.js with
Evergreen.
Cookie.js typo was reported by Steven Chan in LP 790429
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Signed-off-by: Dan Scott <dan@coffeecode.net>
Dan Scott [Tue, 7 Jun 2011 14:16:25 +0000 (10:16 -0400)]
Use the new status.opac_visible attribute in search summary
Until we exposed the OPAC visibility of the status element as set in
config.copy_status, We previously had to hardcode the logic for whether
a given copy should be displayed based on its status. Now we can simply
use the status.opac_visible attribute to determine visibility.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Tue, 7 Jun 2011 14:09:57 +0000 (10:09 -0400)]
Add opac_visible attribute to copy and serial unit statuses
config.copy_status defines an opac_visible column, but that attribute
was not being exposed in the holdings XML, so code that displayed copies
and serial units based on the holdings XML had to hardcode the display
based on the status ID or name instead of using the configured setting.
To simplify display logic, teach holdings XML about the opac_visible
column and expose its value in the status element as a new opac_visible
attribute.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Mon, 6 Jun 2011 17:38:17 +0000 (13:38 -0400)]
Make copy status visibility match default config.copy_status settings
Previous version of this patch had hardcoded copy status settings to
0, 7, 12 to match the "Available" settings, rather than the OPAC
visibility settings available from config.copy_status for each status.
Until config.copy_status.opac_visible translates into an opac_visible
attribute on the status element in the holdings XML, this is probably
the best we can do.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Tue, 31 May 2011 02:49:00 +0000 (22:49 -0400)]
Plug the many OPAC visibility holes in search result item display
Check volume and circ_lib and copy status OPAC visibility (and
deleted status in the case of volumes) in addition to the existing
copy and copy-location checks.
Worst hack is hard-coded copy status IDs of 0, 7, 12 - but this is
currently used throughout the code, so one more can't hurt that much
(OWWW).
Signed-off-by: Dan Scott <dan@coffeecode.net>
Thomas Berezansky [Mon, 13 Jun 2011 13:20:31 +0000 (09:20 -0400)]
Updater apparently reads extensionVersion
Without it no updates are ever found. :(
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Dan Scott [Sat, 11 Jun 2011 11:05:53 +0000 (07:05 -0400)]
Update upgrade files that had conflicting numbers
0549 and 0550 were taken by other commits over time.
Signed-off-by: Dan Scott <dan@coffeecode.net>
Dan Scott [Sat, 11 Jun 2011 11:07:10 +0000 (07:07 -0400)]
Merge branch 'rel_2_1' of git.evergreen-ils.org:Evergreen into dbs/unnest_2_1
Thomas Berezansky [Wed, 8 Jun 2011 18:07:48 +0000 (14:07 -0400)]
Replace instance of location.href
xulG.set_tab populates xulG properly in new URL, location.href does not
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Thomas Berezansky [Tue, 7 Jun 2011 17:45:55 +0000 (13:45 -0400)]
Correct error in call number owning library change
Send IDs to the backend, not objects.
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Thomas Berezansky [Fri, 10 Jun 2011 13:22:56 +0000 (09:22 -0400)]
Mark invalid home ous as such in patron editor
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Jason Etheridge [Fri, 10 Jun 2011 14:42:51 +0000 (10:42 -0400)]
missing string for MFHD deletion
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Bill Erickson [Wed, 8 Jun 2011 19:44:37 +0000 (15:44 -0400)]
Extend hold shelf expire date beyond closed dates
If the shelf_expire_time on a hold would land on a closed date for the
pickup library, push the expire time out to just beyond the close date
range, similar to the circulation due date overlap logic.
In the current iteration, the time component of the date is pushed out
to the end of the day (23:59:59). If this is not generally the desired
behavior, an org setting could be added to bypass this step so that the
time matches "now" (i.e. capture time) instead.
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Jason Etheridge [Thu, 26 May 2011 19:33:20 +0000 (15:33 -0400)]
honor ui.unified_volume_copy_editor setting with Add Volumes in Holdings Maintenance
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Jason Etheridge [Wed, 1 Jun 2011 20:25:50 +0000 (16:25 -0400)]
make unified vol/copy editor honor required stat cats
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Dan Scott [Tue, 7 Jun 2011 17:52:22 +0000 (13:52 -0400)]
Use native unnest() db function instead of explode_array()
Per LP 789747, the custom explode_array() database function
was found to generate significantly slower results for searches than
using the native (and equivalent) unnest() array function. Given that
unnest() has been part of PostgreSQL since 8.4 and Evergreen 2.0
requires a minimum of PostgreSQL 8.4, this patch removes the definition
of the explode_array() functions and replaces its usage with unnest().
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Lebbeous Fogle-Weekley [Fri, 3 Jun 2011 19:17:48 +0000 (15:17 -0400)]
Prevent future dates of birth in patron editor
The patron editor form allowed staff to enter a date of birth that takes
place in the future. While it is theoretically conceivable (hah) that
a library might register patrons that have yet to be born, it is
unlikely enough that we will not even assign this behavior to an
org-unit setting, but we will take the bold move of using a regular
expression to prevent a future dates of birth at all.
Note that if a library system travels into the past, this will cause all
sorts of problems in the patron editor interface (not to mention
overdues). Please do not mix Evergreen and time travel.
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Signed-off-by: Dan Scott <dan@coffeecode.net>
Dan Wells [Thu, 2 Jun 2011 19:44:36 +0000 (15:44 -0400)]
Fix false MFHD editing cues (LP #791974)
The in-DB serial holdings use the same general display code as
the MFHD records, but were falsely triggering MFHD administration
widgets when in fact no MFHD record exists. These holdings were
already being marked, so this fix honors that mark.
Signed-off-by: Dan Wells <dbw2@calvin.edu>
Signed-off-by: Dan Scott <dan@coffeecode.net>
Dan Wells [Thu, 2 Jun 2011 14:17:07 +0000 (10:17 -0400)]
Tweak MFHD scoping
Three changes:
1) Add a closure for 'entryNum' value (currently used for some display
placement and menu-entry correlation)
2) Remove depth-climb to simplify code and better approximate copy scoping
3) Move 'here' assignment out of the foreach
Signed-off-by: Dan Wells <dbw2@calvin.edu>
Signed-off-by: Dan Scott <dan@coffeecode.net>
Dan Scott [Fri, 27 May 2011 17:51:59 +0000 (13:51 -0400)]
Fix rendering of MFHD records when ownership is out of scope
Dojo would die with a null reference error when an MFHD record
was retrieved that was outside of the current OU search scope.
For example, if a given bib record had one linked MFHD record
for BR1, and one linked MFHD record for BR4, the details page
would choke trying to draw the MFHD holdings in a scope that
only included BR1 and end up drawing nothing. Ungood.
Moving the ownership check and invoking _holdingsDrawMFHD()
only after ensuring that the record is within our scope resolves
the problem.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Mon, 6 Jun 2011 16:11:58 +0000 (12:11 -0400)]
LP 791546: advanced search ISBN/ISSN in .staff mode
In 1.6, advanced search ISBN/ISSN searches always operated in .staff
mode, returning results whether the results should have been visible to
the user or not. This confused patrons who saw records to which they had
no access.
In 2.0, this behaviour changed so that advanced search ISBN/ISSN
searches never operated in .staff mode. This confused staff who were
used to retrieving records via the ISBN/ISSN search when they wanted to
add holdings for their own library to the records.
The pattern for addressing this problem and satisfying both use cases is
the same - use the multiclass.query.staff method if we invoke the ISBN
or ISSN searches with the .staff method name.
One could easily refactor many of the search method bodies in this
module to use the exact same logic, keying off the method name to
identify the identifier field and the .staff portion of the method name
to determine whether to invoke .staff mode or not. For now we just
address the ISBN and ISSN entry points.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Signed-off-by: Dan Wells <dbw2@calvin.edu>
Jason Etheridge [Mon, 6 Jun 2011 16:46:21 +0000 (12:46 -0400)]
fix View Holds by preventing an empty IN list with cstore, and stubbing out part_holds
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Signed-off-by: Jason Stephenson <jstephenson@mvlc.org>
Jason Etheridge [Wed, 1 Jun 2011 07:21:06 +0000 (03:21 -0400)]
for the Circulate as Type column in xul lists, display the actual citm value instead of the code
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Jason Etheridge [Wed, 1 Jun 2011 07:17:17 +0000 (03:17 -0400)]
Fix Circulate as Type in the item editor.
The citm retrieval method was changed to use open-ils.fielder, which
doesn't return actual fieldmapper objects, so when data.js went to
convert the retrieved list to a hash, it broke.
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Jason Etheridge [Wed, 1 Jun 2011 07:16:05 +0000 (03:16 -0400)]
Allow util.functional.convert_object_list_to_hash to handle more than fieldmapper-like objects
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Bill Erickson [Fri, 3 Jun 2011 20:35:25 +0000 (16:35 -0400)]
PO activation date display improvement
Use the smarter Util.js date parsing code to prevent small time offsets
in PO activation date display.
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Jason Etheridge [Fri, 3 Jun 2011 19:58:52 +0000 (15:58 -0400)]
tweak function name
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Dan Scott [Fri, 3 Jun 2011 18:48:30 +0000 (14:48 -0400)]
Refactor the "show copy notes button" functionality
Collapse the duplicated code for showing / hiding the "show copy notes
button" into a single method. Might make maintenance a bit easier some
day.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Jason Etheridge [Wed, 1 Jun 2011 19:57:50 +0000 (15:57 -0400)]
fix the Copy Notes button in the unified vol/copy editor
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Signed-off-by: Dan Scott <dan@coffeecode.net>
Dan Wells [Fri, 3 Jun 2011 17:43:40 +0000 (13:43 -0400)]
Clean up a few stock perm mistakes
This upgrade file does cleanup for two errors:
1) accounts for spelling errors (Admin != Administrator)
2) adds a group missed in 0542, for upgraders
Signed-off-by: Dan Wells <dbw2@calvin.edu>
Dan Wells [Fri, 3 Jun 2011 17:00:25 +0000 (13:00 -0400)]
Fixed and extended upgrade file 0542 (stock permissions)
This upgrade file did not work on a multi-upgraded DB, as a bunch of new
permissions and groups never made it into any upgrade.
The changes here are intended to both fix the upgrade and rectify the
missing pieces, where needed.
Signed-off-by: Dan Wells <dbw2@calvin.edu>
Dan Scott [Wed, 1 Jun 2011 22:06:13 +0000 (18:06 -0400)]
Whitespace cleanup in aisle 3 (O:A:Reporter)
Signed-off-by: Dan Scott <dan@coffeecode.net>
Michael Peters [Wed, 1 Jun 2011 12:52:57 +0000 (08:52 -0400)]
LP#740466 Sort report folders by name
Add order_by to Reporter.pm to sort report folders by name
Signed-off-by: Michael Peters <mrpeters@library.in.gov>
Signed-off-by: Dan Scott <dan@coffeecode.net>
Dan Wells [Wed, 1 Jun 2011 18:33:59 +0000 (14:33 -0400)]
Serial holdings display consistency fix
When holdings are sourced from both MFHD and the DB, display may be
inconsistent due to a hard-coded ', ' in Serial.pm. This patch works around
the problem by storing generated_coverage as a JSON array instead of a string,
leaving display formatting to the OPAC.
Signed-off-by: Dan Wells <dbw2@calvin.edu>
Dan Wells [Wed, 1 Jun 2011 18:52:49 +0000 (14:52 -0400)]
Revert "
f424dd8" for bad commit message
This reverts commit
997eef7b50acf10ec2afcb8d8933b75317e0410f.
Dan Wells [Wed, 1 Jun 2011 18:40:43 +0000 (14:40 -0400)]
Dan Wells [Wed, 1 Jun 2011 17:00:32 +0000 (13:00 -0400)]
Missing db upgrade number bump plus backport fix
Signed-off-by: Dan Wells <dbw2@calvin.edu>
Dan Wells [Wed, 1 Jun 2011 15:10:34 +0000 (11:10 -0400)]
Remove specific admin perms, reorganize seed file
The various administrators already have 'EVERYTHING' at their
respective levels, so no need to assign new perms there. The
seed file is now more consistently organized.
Signed-off-by: Dan Wells <dbw2@calvin.edu>
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
(cherry picked from commit
bbc874ddb42ac05130ccfad92fc55ccebd6af882)
Signed-off-by: Mike Rylander <mrylander@gmail.com>
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>
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>
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>
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>
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>
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>
Dan Wells [Wed, 25 May 2011 13:29:13 +0000 (09:29 -0400)]
upgrade_deps_block_check() is not in the branches at this point
Signed-off-by: Dan Wells <dbw2@calvin.edu>
Dan Scott [Wed, 25 May 2011 03:22:32 +0000 (23:22 -0400)]
Use the correct upgrade log format for rel_2_1
Signed-off-by: Dan Scott <dan@coffeecode.net>
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>
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>
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>
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>
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>
Mike Rylander [Mon, 23 May 2011 15:14:31 +0000 (11:14 -0400)]
Merge branch 'rel_2_1' of git.evergreen-ils.org:Evergreen into rel_2_1
Mike Rylander [Mon, 23 May 2011 15:06:51 +0000 (11:06 -0400)]
Revert "Wrap proximity refreshing in a transaction to avoid timespans where there is no such information"
This reverts commit
2a16bb01ebf782a248155bee9c2d37d5b3184e0c.
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Dan Wells [Mon, 23 May 2011 13:38:22 +0000 (09:38 -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>
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>
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>
Dan Wells [Fri, 20 May 2011 15:34:06 +0000 (11:34 -0400)]
Merge branch 'rel_2_1' of git.evergreen-ils.org:Evergreen into rel_2_1
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>
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>
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>
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>
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>
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>
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>
Mike Rylander [Fri, 20 May 2011 13:18:05 +0000 (09:18 -0400)]
Revert "When placing holds on a bib with monographic part, require selection of a specific part"
This reverts commit
69395e8c55db3a0993b2a48eb930ab55402d5c8d.
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>