]> git.evergreen-ils.org Git - working/Evergreen.git/log
working/Evergreen.git
12 years agoMerge branch 'template-toolkit-opac' of git.evergreen-ils.org:evergreen/equinox into...
Mike Rylander [Mon, 13 Jun 2011 14:17:09 +0000 (10:17 -0400)]
Merge branch 'template-toolkit-opac' of git.evergreen-ils.org:evergreen/equinox into template-toolkit-opac

12 years agoMerge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac
Mike Rylander [Mon, 13 Jun 2011 14:17:08 +0000 (10:17 -0400)]
Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac

12 years agoUse the new status.opac_visible attribute in search summary
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>
12 years agoAdd opac_visible attribute to copy and serial unit statuses
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>
12 years agoMake copy status visibility match default config.copy_status settings
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>
12 years agoPlug the many OPAC visibility holes in search result item display
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>
12 years agoPrevent uninit var warnings in QueryParser.pm
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>
12 years agoUpdater apparently reads extensionVersion
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>
12 years agoMerge branch 'master' of git.evergreen-ils.org:Evergreen into dbs/unnest_master
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

12 years agoCorrect base schema for superseded/deprecated functions
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>
12 years agoUpdate upgrade files that had conflicting numbers
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>
12 years agoMerge branch 'master' of git.evergreen-ils.org:Evergreen into dbs/unnest_master
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

12 years agoadd the patron opt-in settings
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>
12 years agopatch from James Fournie re: https://bugs.launchpad.net/evergreen/+bug/510959 for...
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>
12 years agoShowing hold/copy summary in details page
Bill Erickson [Fri, 10 Jun 2011 20:16:21 +0000 (16:16 -0400)]
Showing hold/copy summary in details page

Signed-off-by: Bill Erickson <berick@esilibrary.com>
12 years agoMerge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac
Bill Erickson [Fri, 10 Jun 2011 18:22:02 +0000 (14:22 -0400)]
Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac

12 years agoChilifresh reviews for results and record pages
Bill Erickson [Fri, 10 Jun 2011 18:21:50 +0000 (14:21 -0400)]
Chilifresh reviews for results and record pages

Signed-off-by: Bill Erickson <berick@esilibrary.com>
12 years agoPass ENV down to template environment
Bill Erickson [Fri, 10 Jun 2011 18:21:13 +0000 (14:21 -0400)]
Pass ENV down to template environment

Signed-off-by: Bill Erickson <berick@esilibrary.com>
12 years agoAdded Chilifresh secure url to sample apache config
Bill Erickson [Fri, 10 Jun 2011 18:20:50 +0000 (14:20 -0400)]
Added Chilifresh secure url to sample apache config

12 years agoSigned-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

12 years agoReplace instance of location.href
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>
12 years agoCorrect error in call number owning library change
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>
12 years agoMerge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac
Bill Erickson [Fri, 10 Jun 2011 16:51:17 +0000 (12:51 -0400)]
Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac

12 years agoMerge branch 'master' of git.evergreen-ils.org:Evergreen
Bill Erickson [Fri, 10 Jun 2011 15:48:53 +0000 (11:48 -0400)]
Merge branch 'master' of git.evergreen-ils.org:Evergreen

12 years agoMark invalid home ous as such in patron editor
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>
12 years agoMark invalid home ous as such in patron editor
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>
12 years agomissing string for MFHD deletion
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>
12 years agoadded notification of successful settings update to patron prefs page
Bill Erickson [Thu, 9 Jun 2011 20:51:20 +0000 (16:51 -0400)]
added notification of successful settings update to patron prefs page

Signed-off-by: Bill Erickson <berick@esilibrary.com>
12 years agohonor hit count user pref on results page
Bill Erickson [Thu, 9 Jun 2011 20:39:03 +0000 (16:39 -0400)]
honor hit count user pref on results page

Signed-off-by: Bill Erickson <berick@esilibrary.com>
12 years agoInitial support for updating user prefs
Bill Erickson [Thu, 9 Jun 2011 20:04:43 +0000 (16:04 -0400)]
Initial support for updating user prefs

Starting with hits-per-page and enable/disable circ/hold history

Signed-off-by: Bill Erickson <berick@esilibrary.com>
12 years agoMerge branch 'template-toolkit-opac' of git.evergreen-ils.org:evergreen/equinox into...
Mike Rylander [Thu, 9 Jun 2011 18:07:12 +0000 (14:07 -0400)]
Merge branch 'template-toolkit-opac' of git.evergreen-ils.org:evergreen/equinox into template-toolkit-opac

12 years agoMerge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac
Mike Rylander [Thu, 9 Jun 2011 18:07:11 +0000 (14:07 -0400)]
Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac

12 years agosyntax error
Jason Etheridge [Thu, 9 Jun 2011 17:29:19 +0000 (13:29 -0400)]
syntax error

Signed-off-by: Jason Etheridge <jason@esilibrary.com>
12 years agopin a version number
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>
12 years agoUnwrapped upgrade script for transit checkin interval setting/perm
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>
12 years agoTransit minimum checkin interval setting
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>
12 years agoadded read support for holds history setting
Bill Erickson [Thu, 9 Jun 2011 13:17:04 +0000 (09:17 -0400)]
added read support for holds history setting

12 years agoRead support for some user settings in setting page
Bill Erickson [Wed, 8 Jun 2011 21:25:31 +0000 (17:25 -0400)]
Read support for some user settings in setting page

Search hits per page and circ history opt-in displaying

TODO: add more settings
TODO: implement POST/write for updating values

Signed-off-by: Bill Erickson <berick@esilibrary.com>
12 years agoExtend hold shelf expire date beyond closed dates
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>
12 years agoSelect all fines for CC payment by default
Bill Erickson [Wed, 8 Jun 2011 16:46:51 +0000 (12:46 -0400)]
Select all fines for CC payment by default

12 years agohonor ui.unified_volume_copy_editor setting with Add Volumes in Holdings Maintenance
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>
12 years agomake unified vol/copy editor honor required stat cats
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>
12 years agoAdd i18n support for "Retrieving title..." tab name
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>
12 years agoIntegration of unified vol/copy editor and fast add
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>
12 years agoUse native unnest() db function instead of explode_array()
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>
12 years agoPrevent future dates of birth in patron editor
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>
12 years agoFix false MFHD editing cues (LP #791974)
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>
12 years agoTweak MFHD scoping
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>
12 years agoMerge branch 'master' of git.evergreen-ils.org:Evergreen into dbs/fix-mfhd-render
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

12 years agoLP 791546: advanced search ISBN/ISSN in .staff mode
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>
12 years agofix View Holds by preventing an empty IN list with cstore, and stubbing out part_holds
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>
12 years agofor the Circulate as Type column in xul lists, display the actual citm value instead...
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>
12 years agoFix Circulate as Type in the item editor.
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>
12 years agoAllow util.functional.convert_object_list_to_hash to handle more than fieldmapper...
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>
12 years agoMerge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac
Mike Rylander [Sun, 5 Jun 2011 14:45:53 +0000 (10:45 -0400)]
Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac

12 years agoPO activation date display improvement
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>
12 years agotweak function name
Jason Etheridge [Fri, 3 Jun 2011 19:58:52 +0000 (15:58 -0400)]
tweak function name

Signed-off-by: Jason Etheridge <jason@esilibrary.com>
12 years agoRefactor the "show copy notes button" functionality
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>
12 years agofix the Copy Notes button in the unified vol/copy editor
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>
12 years agoClean up a few stock perm mistakes, part 2
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>
12 years agoClean up a few stock perm mistakes
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>
12 years agoMerge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac
Mike Rylander [Fri, 3 Jun 2011 17:10:14 +0000 (13:10 -0400)]
Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac

12 years agoFixed and extended upgrade file 0542 (stock permissions)
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>
12 years agoMerge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac
Mike Rylander [Fri, 3 Jun 2011 13:56:20 +0000 (09:56 -0400)]
Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac

12 years agoWrapped upgrade script
Bill Erickson [Fri, 3 Jun 2011 12:35:21 +0000 (08:35 -0400)]
Wrapped upgrade script

Signed-off-by: Bill Erickson <berick@esilibrary.com>
12 years agoUpgrade script, needs wrapping.
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>
12 years agoSip Statcats - Actor/Asset Statcats via SIP2
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>
12 years agoMerge of transit_abort_perms from git.evergreen-ils.org:evergreen/equinox.git into...
Mike Rylander [Thu, 2 Jun 2011 14:56:25 +0000 (10:56 -0400)]
Merge of transit_abort_perms from git.evergreen-ils.org:evergreen/equinox.git into master

Signed-off-by: Mike Rylander <mrylander@gmail.com>
12 years agoPermission to allow transit abort on lost/missing
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>
12 years agoMerge branch 'master' of git.evergreen-ils.org:Evergreen into patron_no_collections2
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>
12 years agoMerge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac
Mike Rylander [Thu, 2 Jun 2011 14:33:44 +0000 (10:33 -0400)]
Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac

12 years agoWhitespace cleanup in aisle 3 (O:A:Reporter)
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>
12 years agoLP#740466 add order by name method to Reporter.pm to sort report folders by name...
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>
12 years agoCollections exemption user setting
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>
12 years agoSerial holdings display consistency fix
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>
12 years agoMissing db upgrade number bump
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>
12 years agoRemove specific admin perms, reorganize seed file
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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 years agoMerge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac
Mike Rylander [Wed, 1 Jun 2011 15:49:36 +0000 (11:49 -0400)]
Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac

12 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>
12 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>
12 years agoMerge branch 'master' of git.evergreen-ils.org:Evergreen into dbs/fix-mfhd-render
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

12 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>
12 years agoMerge branch 'master' of git.evergreen-ils.org:Evergreen into dbs/fix-mfhd-render
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

12 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>
12 years agoMerge branch 'template-toolkit-opac' of git://git.evergreen-ils.org/evergreen/equinox...
Bill Erickson [Sat, 28 May 2011 14:03:22 +0000 (10:03 -0400)]
Merge branch 'template-toolkit-opac' of git://git.evergreen-ils.org/evergreen/equinox into template-toolkit-opac

12 years agoFormat selector improvements
Bill Erickson [Sat, 28 May 2011 14:01:43 +0000 (10:01 -0400)]
Format selector improvements

Consistent with format icon fall-thru, try mattype first to locate the
list of formats for search selection.  If no mattype configuration is
found, fall through to item_type.

Signed-off-by: Bill Erickson <berick@esilibrary.com>
12 years agoMerge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac
Mike Rylander [Fri, 27 May 2011 18:45:59 +0000 (14:45 -0400)]
Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac

12 years agoFix rendering of MFHD records when ownership is out of scope user/dbs/fix-mfhd-render
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>
12 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>
12 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>
12 years agoMerge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac
Mike Rylander [Fri, 27 May 2011 00:11:26 +0000 (20:11 -0400)]
Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac

12 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>
12 years agoMerge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac
Mike Rylander [Thu, 26 May 2011 17:12:05 +0000 (13:12 -0400)]
Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac