Bill Erickson [Thu, 16 Jun 2011 15:50:16 +0000 (11:50 -0400)]
Repaired exchange rate PO activation bug
Code was using the wrong hash key to read data from cstore request,
resulting in a NULL debit amount when activating a PO with a different
provider => fund currencies. This resulted in POs that could not be
activated.
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Thomas Berezansky [Thu, 16 Jun 2011 11:15:27 +0000 (07:15 -0400)]
Check if in staff client when placing holds
Staff may have valid reasons to use a non-opac-visible org unit.
So before bailing on a hidden org unit, check if we are in the staff client.
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Mike Rylander [Thu, 16 Jun 2011 14:16:39 +0000 (10:16 -0400)]
Move the user/dbs/lp797304_lp797307 upgrade script into place with a number
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Mike Rylander [Thu, 16 Jun 2011 13:50:25 +0000 (09:50 -0400)]
Merging branch user/dbs/lp797304_lp797307
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Cherry picking the following:
commit
7be2a32620587af27de4316e42a308e913e9314c
Author: Dan Scott <dan@coffeecode.net>
Date: Tue Jun 14 22:35:26 2011 -0400
Add a stored procedure to reingest problematic URIs
Assuming that href = label in asset.uri is a red enough flag for the
problem in LP 797307 where the perfectly good label was being thrown
away, reingest the unique set of records connected with such asset.uri
rows.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
commit
39fe0c4a8a3074ff4c1e427ad9f00a0760bac260
Author: Dan Scott <dan@coffeecode.net>
Date: Tue Jun 14 21:54:51 2011 -0400
Add unwrapped upgrade script for biblio.extract_located_uris
See XXXX.biblio.extract_located_uris.sql for the upgrade script, waiting
to be signed off and committed.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
create mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.biblio.extract_located_uris.sql
commit
7e6d2bfd7e9a5cbe57e4aacdf0b4b015a566883d
Author: Dan Scott <dan@coffeecode.net>
Date: Tue Jun 14 21:34:15 2011 -0400
Avoid duplicate row issues in biblio.extract_located_uris
As there is currently no unique constraint on the non-ID columns of
asset.uri, ensure that we only select a single ID from the tables until
we dedupe the tables. Use an ORDER BY to grab the matching row with the
lowest ID so we can clear out the rows with higher IDs.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
commit
e79a805299ec734a29ee5bfa77dc74bc1fd208cd
Author: Dan Scott <dan@coffeecode.net>
Date: Tue Jun 14 14:02:49 2011 -0400
Fix LP 797304 and 797307 - asset.uri parsing bugs
Per 797304: one would expect asset.uri.label to be populated with the
value of 856 $y, however, it was getting populated with 856 $u - perhaps
as a result of the ordering of array entries in XPATH() not matching the
XPath expression. Instead of including 856 $u in the XPath expression
for uri_label, just assign its value to uri_label if uri_label is
otherwise NULL.
Per 797307: biblio.extract_located_uris() tries to reuse an existing
active asset.uri entry rather than create a new row; however, it does
not handle the case where there is no public note aka "use restriction"
and will end up creating a duplicate row every time the record is
reingested. Teach it to handle NULL values properly.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
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 Wells [Tue, 14 Jun 2011 13:38:23 +0000 (09:38 -0400)]
Tweak new single close button for minimum space
This change restores the overall space and position of the close
button while keeping the other improvements (appears once, shows
even with no notes)
Signed-off-by: Dan Wells <dbw2@calvin.edu>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Dan Wells [Tue, 14 Jun 2011 13:38:23 +0000 (09:38 -0400)]
Tweak new single close button for minimum space
This change restores the overall space and position of the close
button while keeping the other improvements (appears once, shows
even with no notes)
Signed-off-by: Dan Wells <dbw2@calvin.edu>
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 22:02:41 +0000 (18:02 -0400)]
Trivial aesthetic change: only one "close window" button for the window,
rather than one per note.
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Lebbeous Fogle-Weekley [Mon, 13 Jun 2011 21:29:59 +0000 (17:29 -0400)]
Merge branch 'master' of git://git.evergreen-ils.org/Evergreen into lp-796795_serial_note_improvements
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 Wells [Mon, 13 Jun 2011 18:16:47 +0000 (14:16 -0400)]
Serial note perms and edit support
This expands the interface to allow for editing notes on serials
objects. At some point we will likely want to track edit dates as
well, but this gets the ball rolling.
Also renames some methods from 'create' to 'update' to match new
capabilities and make the overall API more consistent, and adds perm
checks based on related objects.
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 14:58:34 +0000 (10:58 -0400)]
Typo, we need commas
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Mike Rylander [Mon, 13 Jun 2011 14:45:20 +0000 (10:45 -0400)]
Thinko fix -- split upgrade script, forgot to inc the version in the second
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Mike Rylander [Mon, 13 Jun 2011 14:38:38 +0000 (10:38 -0400)]
Merge branch 'master' of git.evergreen-ils.org:Evergreen
Mike Rylander [Mon, 13 Jun 2011 14:38:29 +0000 (10:38 -0400)]
Bring in-db unAPI opac visibility info up to date with (and a little beyond)
ea3b8857d08b8a9050e763f8084c841e8df9a473
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Jason Etheridge [Mon, 13 Jun 2011 14:35:41 +0000 (10:35 -0400)]
Merge branch 'master' of git.evergreen-ils.org:Evergreen
Jason Etheridge [Mon, 13 Jun 2011 14:33:49 +0000 (10:33 -0400)]
change accesskeys 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>
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>
Dan Scott [Mon, 13 Jun 2011 13:45:39 +0000 (09:45 -0400)]
Prevent uninit var warnings in QueryParser.pm
$suffix_op and $prefix_op would not be defined if $suffix or $prefix did
not evaluate to true, leading to warnings about undefined variables in
open-ils.storage_stderr.log.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
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:31:34 +0000 (07:31 -0400)]
Merge branch 'master' of git.evergreen-ils.org:Evergreen into dbs/unnest_master
Dan Scott [Sat, 11 Jun 2011 11:23:45 +0000 (07:23 -0400)]
Correct base schema for superseded/deprecated functions
As discussed on Evergreen dev list, the base schema didn't
match what one would accomplish via upgrades for the
evergreen.upgrade_list_applied_deprecated() and
evergreen.upgrade_list_applied_superseded() functions;
they were returning TEXT instead of SETOF TEXT.
Signed-off-by: Dan Scott <dan@coffeecode.net>
Dan Scott [Sat, 11 Jun 2011 11:05:53 +0000 (07:05 -0400)]
Update upgrade files that had conflicting numbers
Signed-off-by: Dan Scott <dan@coffeecode.net>
Dan Scott [Sat, 11 Jun 2011 11:03:29 +0000 (07:03 -0400)]
Merge branch 'master' of git.evergreen-ils.org:Evergreen into dbs/unnest_master
Also update the now-conflicting SQL upgrade scripts.
Conflicts:
Open-ILS/src/sql/Pg/002.schema.config.sql
Jason Etheridge [Fri, 10 Jun 2011 20:40:46 +0000 (16:40 -0400)]
add the patron opt-in settings
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Jason Etheridge [Tue, 29 Mar 2011 15:31:58 +0000 (11:31 -0400)]
patch from James Fournie re: https://bugs.launchpad.net/evergreen/+bug/510959 for improved patron opt-in
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Jason Etheridge [Fri, 10 Jun 2011 18:12:27 +0000 (14:12 -0400)]
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
git training
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>
Bill Erickson [Fri, 10 Jun 2011 15:48:53 +0000 (11:48 -0400)]
Merge branch 'master' of git.evergreen-ils.org:Evergreen
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>
Jason Etheridge [Thu, 9 Jun 2011 17:29:19 +0000 (13:29 -0400)]
syntax error
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Jason Etheridge [Thu, 9 Jun 2011 17:29:00 +0000 (13:29 -0400)]
pin a version number
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Bill Erickson [Thu, 9 Jun 2011 14:13:18 +0000 (10:13 -0400)]
Unwrapped upgrade script for transit checkin interval setting/perm
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Bill Erickson [Thu, 9 Jun 2011 14:03:10 +0000 (10:03 -0400)]
Transit minimum checkin interval setting
OK, here's the situation, a copy went away on a week's vacation...
Support for preventing checkin of a copy that was put into transit "too
recently". The scenario that prompted the development is this:
Copy at Branch A is checked in and put into transit to fill a hold at
Branch B. The copy is then accidentally checked in at Branch B.
(Imagine a crate of items with a superbarcode gets checked in at
Branch B and the copy in question was presumed to be in that crate).
This puts the item on the holds shelf (assuming a hold transit) at
Branch B and notifies the patrom the item is ready for pickup.
However, the copy is still just embarking from Branch A.
This new setting allows libraries to configure a minimum transit time.
If a copy is put into transit and checked in during the configured
interval, the checkin will return an (overridable) event that prevents
checkin. If the setting is not configured, this has no affect on
checkin.
Signed-off-by: Bill Erickson <berick@esilibrary.com>
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, 31 May 2011 15:41:13 +0000 (11:41 -0400)]
Add i18n support for "Retrieving title..." tab name
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Jason Etheridge [Fri, 27 May 2011 15:41:55 +0000 (11:41 -0400)]
Integration of unified vol/copy editor and fast add
* Wire up unified vol/copy editor for marc editor fast item add function
* Robustify callnumber vivication for unified vol/copy editor from marc editor
* Load opac after unified vol/copy with marc editor fast add.
* Various bug fixes
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 [Mon, 6 Jun 2011 19:18:06 +0000 (15:18 -0400)]
Merge branch 'master' of git.evergreen-ils.org:Evergreen into dbs/fix-mfhd-render
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 18:16:49 +0000 (14:16 -0400)]
Clean up a few stock perm mistakes, part 2
0547 did not completely apply to rel_2_1, so the correction of errant inserts
from 0545 has been split off into this upgrade instead, for clarity.
Signed-off-by: Dan Wells <dbw2@calvin.edu>
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 three errors:
1) deletes errant inserts from 0545 (group 4 is not the circulation admin group)
2) accounts for spelling errors (Admin != Administrator)
3) 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>
Bill Erickson [Fri, 3 Jun 2011 12:35:21 +0000 (08:35 -0400)]
Wrapped upgrade script
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Thomas Berezansky [Sun, 29 May 2011 01:44:45 +0000 (21:44 -0400)]
Upgrade script, needs wrapping.
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Thomas Berezansky [Sun, 29 May 2011 01:44:35 +0000 (21:44 -0400)]
Sip Statcats - Actor/Asset Statcats via SIP2
Stat cats can now have a sip_field and sip_format.
sip_field is the field identifier code, sip_format is one of the following:
1 - Null/Empty, places stat cat value in as-is
2 - A plain string, placed in value as-is when stat cat has value
3 - A plain string with a %s, 1 and 2 combined, where the stat cat value replaces the %s
4 - A regular expression surrounded by | characters (ex, |([0-9]*) -|):
If the regular expression does not match the value, nothing
If the regular expression matches and has a capture group, the captured group
If the regular expression matches and does not have a capture group, the entire match
The | was used because it would otherwise be stripped from the final result anyway.
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Mike Rylander [Thu, 2 Jun 2011 14:56:25 +0000 (10:56 -0400)]
Merge ... transit_abort_perms from git.evergreen-ils.org:evergreen/equinox.git into master
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Bill Erickson [Wed, 1 Jun 2011 21:29:01 +0000 (17:29 -0400)]
Permission to allow transit abort on lost/missing
This patch introduces a permission that allows staff to abort transits
for items in the lost/missing status. Previous, this was disallowed by
a hard-coded block.
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Mike Rylander [Thu, 2 Jun 2011 14:33:35 +0000 (10:33 -0400)]
Merge branch 'master' of git.evergreen-ils.org:Evergreen into patron_no_collections2
Signed-off-by: Mike Rylander <mrylander@gmail.com>
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 add order by name method 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>
Bill Erickson [Wed, 1 Jun 2011 21:01:36 +0000 (17:01 -0400)]
Collections exemption user setting
Adds a new user setting "circ.collections.exempt" which, when set to
true for a user, means the user will not be considered for collections.
It does this by ignoring the user when calculating the list of users of
interest in the "open-ils.collections.users_of_interest.retrieve" API
call.
Signed-off-by: Bill Erickson <berick@esilibrary.com>
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 16:56:43 +0000 (12:56 -0400)]
Missing db upgrade number bump
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>
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>
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>
Dan Scott [Tue, 31 May 2011 21:00:34 +0000 (17:00 -0400)]
Merge branch 'master' of git.evergreen-ils.org:Evergreen into dbs/fix-mfhd-render
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>
Dan Scott [Tue, 31 May 2011 13:32:57 +0000 (09:32 -0400)]
Merge branch 'master' of git.evergreen-ils.org:Evergreen into dbs/fix-mfhd-render
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>
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>
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>
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 15:08:21 +0000 (11:08 -0400)]
Merge branch 'master' of git.evergreen-ils.org:Evergreen
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>