]> git.evergreen-ils.org Git - working/Evergreen.git/log
working/Evergreen.git
12 years agoFix "Retarget Local Holds" for non-holdable copies
Thomas Berezansky [Fri, 19 Aug 2011 13:46:40 +0000 (09:46 -0400)]
Fix "Retarget Local Holds" for non-holdable copies

Specificially:

Wrap holdable check in is_true
Add check for current copy status holdable
Add check for current copy location holdable

The latter stores the fetched location for later use.
The one later use I found updated to check if the location is a reference.

The update copy code already checks if location is a reference and deals
with it properly.

Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
12 years agoVandelay: Insufficient Quality Fall-Thru Merge Profile
Bill Erickson [Fri, 19 Aug 2011 15:20:55 +0000 (11:20 -0400)]
Vandelay: Insufficient Quality Fall-Thru Merge Profile

When a user selects "Merge On Single Match" or "Merge On Best Match" and
apply a minimum quality ratio, the fall-through profile will be used in
a secondary merge attempt for any records that fail the initial merge
due to insufficient record quality.

This allows the user to choose 2 different outcomes based on record
quality.  For example, you may wish to do a full overlay for all
high-quality records, but only extract subjects or other information
from lower quality records.  This also allows users to do record+copy
imports for high-quality records and copy-only imports for low quality
records (using a no-op merge profile like "replace 901c").

Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
12 years agoBranchify patch from LP bug #802523.
Jason Stephenson [Tue, 9 Aug 2011 17:41:04 +0000 (13:41 -0400)]
Branchify patch from LP bug #802523.

Signed-off-by: Jason Stephenson <jstephenson@mvlc.org>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
12 years agoUI cleanup for batch-holds from lists
Bill Erickson [Tue, 23 Aug 2011 14:42:54 +0000 (10:42 -0400)]
UI cleanup for batch-holds from lists

* Handle hold placement override with a single form and checkboxes
instead of a series individual forms

* Added a cancel button on the override page

Signed-off-by: Bill Erickson <berick@esilibrary.com>
12 years agoMake the sort-by and limit-to-available controls appear after adv search
Lebbeous Fogle-Weekley [Mon, 22 Aug 2011 22:28:18 +0000 (18:28 -0400)]
Make the sort-by and limit-to-available controls appear after adv search

This is hackish and suboptimal until we leverage the parsed queries soon
to be returned by QP.

Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
12 years agostamp an upgrade version for the czs use_perm feature
Jason Etheridge [Mon, 22 Aug 2011 21:32:09 +0000 (17:32 -0400)]
stamp an upgrade version for the czs use_perm feature

Signed-off-by: Jason Etheridge <jason@esilibrary.com>
12 years agouse_perm column for config.z3950_source
Jason Etheridge [Fri, 22 Jul 2011 05:47:15 +0000 (01:47 -0400)]
use_perm column for config.z3950_source

The idea is that if a permission code is specified for a given source, then
staff will need that permission to use that source in the staff client z39.50
interface.

Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
12 years agoTPac: batch holds from on-the-fly lists and bookbags
Bill Erickson [Thu, 18 Aug 2011 21:14:38 +0000 (17:14 -0400)]
TPac: batch holds from on-the-fly lists and bookbags

* Enable the 'Place Hold' action in the drop-down for bookbag and
on-the-fly list items

* Place hold form now support lists of targets and will report error
conditions for each target

* Batch and individual hold overrides supported where appropriate

Signed-off-by: Bill Erickson <berick@esilibrary.com>
12 years agoFix penalty generation during billing creation
Jason Etheridge [Fri, 19 Aug 2011 22:22:28 +0000 (18:22 -0400)]
Fix penalty generation during billing creation

by passing the editor object referencing the database transaction to xact_org

Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
12 years agoDisplay only available formats for metarecord holds in IE
Lebbeous Fogle-Weekley [Mon, 22 Aug 2011 14:37:30 +0000 (10:37 -0400)]
Display only available formats for metarecord holds in IE

The OPAC's usual hideMe()/unHideMe() tricks don't work for <option>
elements in Internet Explorer 8.  Use the disabled attribute.

Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
12 years agoRemove cache-generator.sh from Makefile.am
Dan Scott [Sat, 20 Aug 2011 21:51:46 +0000 (17:51 -0400)]
Remove cache-generator.sh from Makefile.am

In a previous commit, we removed cache-generator.sh. Now we remove the
remaining reference to it in the Makefile.am that was generating an
error (reported by Ben Webb).

Signed-off-by: Dan Scott <dan@coffeecode.net>
12 years agoT-PAC: Localize payment refund policy message
Dan Scott [Fri, 19 Aug 2011 20:46:39 +0000 (16:46 -0400)]
T-PAC: Localize payment refund policy message

The policy in all likelihood will differ from library to library anyway,
but we might as well ensure that it can be translated.

Signed-off-by: Dan Scott <dscott@laurentian.ca>
12 years agoDisable Google Analytics in T-PAC by default
Dan Scott [Fri, 19 Aug 2011 20:35:12 +0000 (16:35 -0400)]
Disable Google Analytics in T-PAC by default

The option to enable Google Analytics has been turned into a config
setting in parts/config.tt2 for now, with a place to set the GA account
code.

Also, get consistent with foo.enabled instead of a mix of foo.enable /
foo.enabled in config.tt2.

Also, be a bit more careful about whitespace and hide comments in the
HTML source about things that are disabled (such as ChiliFresh and
Google Analytics) until they are enabled.

Signed-off-by: Dan Scott <dscott@laurentian.ca>
12 years agoVandelay: repair item attr context org selector
Bill Erickson [Fri, 19 Aug 2011 19:50:22 +0000 (15:50 -0400)]
Vandelay: repair item attr context org selector

1. Prevents resetting the context selector to the workstation org unit
each time it's changed.

2. Prevent the unintentional pileup of dojo.connect() events, which
can lead to exponential growth in the number of server calls to fetch
import-item-attribute-definitions with each change of the context org
selector.

Signed-off-by: Bill Erickson <berick@esilibrary.com>
12 years agoMerge branch 'master' of git.evergreen-ils.org:Evergreen into dbs/ttopac-master-merge
Dan Scott [Fri, 19 Aug 2011 19:39:12 +0000 (15:39 -0400)]
Merge branch 'master' of git.evergreen-ils.org:Evergreen into dbs/ttopac-master-merge

12 years ago#LP801961, error when running edi_fetcher.pl
Ben Shum [Tue, 2 Aug 2011 15:15:57 +0000 (11:15 -0400)]
#LP801961, error when running edi_fetcher.pl

This patch addresses an error encountered when running edi_fetcher.pl.
The method "is_dir" should be just plain "dir" in RemoteAccount.pm file.
Signed-off-by: Ben Shum <bshum@biblio.org>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
12 years agoBranchify second patch from James Fournie on LP bug #791941.
Jason Stephenson [Tue, 9 Aug 2011 19:43:12 +0000 (15:43 -0400)]
Branchify second patch from James Fournie on LP bug #791941.

Signed-off-by: Jason Stephenson <jstephenson@mvlc.org>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
12 years agoBranchify the first patch from James Fournie on LP bug #791941.
Jason Stephenson [Tue, 9 Aug 2011 19:40:41 +0000 (15:40 -0400)]
Branchify the first patch from James Fournie on LP bug #791941.

Signed-off-by: Jason Stephenson <jstephenson@mvlc.org>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
12 years agoBranchify patch from LP bug #809478 and forward port to master.
Robert Soulliere [Tue, 9 Aug 2011 19:18:15 +0000 (15:18 -0400)]
Branchify patch from LP bug #809478 and forward port to master.

Signed-off-by: Jason Stephenson <jstephenson@mvlc.org>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
12 years agoTpac: fetch bib record piles non-atomicly to avoid large messages
Bill Erickson [Fri, 19 Aug 2011 13:56:48 +0000 (09:56 -0400)]
Tpac: fetch bib record piles non-atomicly to avoid large messages

Signed-off-by: Bill Erickson <berick@esilibrary.com>
12 years agoTpac: fetch bib record piles non-atomicly to avoid large messages
Bill Erickson [Fri, 19 Aug 2011 13:56:48 +0000 (09:56 -0400)]
Tpac: fetch bib record piles non-atomicly to avoid large messages

Signed-off-by: Bill Erickson <berick@esilibrary.com>
12 years agoTpac: stream bookbag entry retrieval to reduce msg size
Bill Erickson [Fri, 19 Aug 2011 12:48:04 +0000 (08:48 -0400)]
Tpac: stream bookbag entry retrieval to reduce msg size

Signed-off-by: Bill Erickson <berick@esilibrary.com>
12 years agoTpac: stream bookbag entry retrieval to reduce msg size
Bill Erickson [Fri, 19 Aug 2011 12:48:04 +0000 (08:48 -0400)]
Tpac: stream bookbag entry retrieval to reduce msg size

Signed-off-by: Bill Erickson <berick@esilibrary.com>
12 years agoStricter order for actor.org_unit_parent_protect()
Dan Wells [Tue, 16 Aug 2011 21:22:47 +0000 (17:22 -0400)]
Stricter order for actor.org_unit_parent_protect()

actor.org_unit_parent_protect() may not work due to the fact
that 'IF' conditions in PL/pgSQL are not necessarily processed
in the order written. This line:

"IF TG_OP = 'INSERT' OR NEW.parent_ou
IS DISTINCT FROM OLD.parent_ou THEN"

may fail because the 'IS DISTINCT FROM' happens before the
'INSERT' check, and and that fails because there is no 'OLD'
variable for INSERTs.

This commit may not be the optimal style for this circumstance
in this language, but it works.  It also appears to change more
than it really does due to a loss of one level of indentation in
the structure.

Signed-off-by: Dan Wells <dbw2@calvin.edu>
Signed-off-by: Dan Scott <dscott@laurentian.ca>
12 years agoWhitespace Only Changes
Dan Wells [Tue, 16 Aug 2011 21:16:35 +0000 (17:16 -0400)]
Whitespace Only Changes

Files uses primarily tabs, function used both spaces and tabs.
It now uses all tabs.

Signed-off-by: Dan Wells <dbw2@calvin.edu>
Signed-off-by: Dan Scott <dscott@laurentian.ca>
12 years agoUpdate README to reflect the --create-database option
Dan Scott [Thu, 18 Aug 2011 19:32:53 +0000 (15:32 -0400)]
Update README to reflect the --create-database option

Now that eg_db_config.pl is intelligent enough to create the database,
update the README to free people from the tyranny of having to manually
issue database creation (and contrib-adding) commands.

Signed-off-by: Dan Scott <dscott@laurentian.ca>
12 years agoMerge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac
Bill Erickson [Thu, 18 Aug 2011 16:27:54 +0000 (12:27 -0400)]
Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac

12 years agoTpac: style inactive holds w/ grey bground
Bill Erickson [Thu, 18 Aug 2011 16:17:03 +0000 (12:17 -0400)]
Tpac: style inactive holds w/ grey bground

Signed-off-by: Bill Erickson <berick@esilibrary.com>
12 years agoTpac: style inactive holds w/ grey bground
Bill Erickson [Thu, 18 Aug 2011 16:17:03 +0000 (12:17 -0400)]
Tpac: style inactive holds w/ grey bground

Signed-off-by: Bill Erickson <berick@esilibrary.com>
12 years agoAdd --create-database option to eg_db_config.pl user/tsbere/create_database
Thomas Berezansky [Thu, 18 Aug 2011 16:06:46 +0000 (12:06 -0400)]
Add --create-database option to eg_db_config.pl

Uses create_database.sql and superuser rights to do all
database creation steps other than making a usable superuser
account to begin with.

Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
12 years agoT-PAC: Point the Basic Catalog link to the T-PAC
Dan Scott [Thu, 18 Aug 2011 15:04:20 +0000 (11:04 -0400)]
T-PAC: Point the Basic Catalog link to the T-PAC

Now that the T-PAC provides the base functionality (and more!) required
by the HTML-only basic catalog, but in a more extensible / skinnable
fashion, replace the link from the JSPAC to the Basic Catalog with a
link to the T-PAC - and add a reciprocal link from the T-PAC back to the
JSPAC, in case anybody wants to go that route.

Signed-off-by: Dan Scott <dscott@laurentian.ca>
12 years agoMerge branch 'master' of git.evergreen-ils.org:Evergreen into dbs/ttopac-master-merge
Dan Scott [Thu, 18 Aug 2011 13:22:17 +0000 (09:22 -0400)]
Merge branch 'master' of git.evergreen-ils.org:Evergreen into dbs/ttopac-master-merge

12 years agoTPAC: Remove one more KCLS reference
Dan Scott [Thu, 18 Aug 2011 11:36:18 +0000 (07:36 -0400)]
TPAC: Remove one more KCLS reference

KCLS probably doesn't want us to link to their libraries from every
Evergreen instance...

Signed-off-by: Dan Scott <dscott@laurentian.ca>
12 years agoRemove CONFIG references from autogen.sh
Dan Scott [Tue, 16 Aug 2011 03:52:24 +0000 (23:52 -0400)]
Remove CONFIG references from autogen.sh

We're relying on OpenILS::Utils::Cronscript for the location of the
opensrf_core.xml file, so the vestigial references were unnecessary
noise.

Signed-off-by: Dan Scott <dscott@laurentian.ca>
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
12 years agoFurther autogen.sh cleanup
Dan Scott [Tue, 16 Aug 2011 03:14:01 +0000 (23:14 -0400)]
Further autogen.sh cleanup

* Roll cache-generator.sh functionality into autogen.sh
* No longer install deleted scripts
* Teach Perl build infrastructure about OpenILS::Utils::Configure

Signed-off-by: Dan Scott <dscott@laurentian.ca>
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
12 years agoRevamp autogen.sh to call functions from a Perl module
Dan Scott [Mon, 15 Aug 2011 22:03:37 +0000 (18:03 -0400)]
Revamp autogen.sh to call functions from a Perl module

This cut moves all of the logic from the individual scripts that
autogen.sh used to call into a self-contained Perl module. We use
OpenILS::Utils::Cronscript to avoid much of the init dupe code.

Note that calling Perl functions from a bash script is not crazy pretty,
but perhaps in the long run autogen.sh becomes something else. This is
just a step towards consolidating those functions in a single module
while maintaining the same interface as before.

Signed-off-by: Dan Scott <dscott@laurentian.ca>
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
12 years agoTpac: repaired propagator casulaty; using mkurl instead
Bill Erickson [Wed, 17 Aug 2011 21:37:13 +0000 (17:37 -0400)]
Tpac: repaired propagator casulaty; using mkurl instead

Signed-off-by: Bill Erickson <berick@esilibrary.com>
12 years agoTPAC: Strip the "page" GET param from author searches
Dan Scott [Wed, 17 Aug 2011 21:18:54 +0000 (17:18 -0400)]
TPAC: Strip the "page" GET param from author searches

mkurl() generates a URL that, by default, retains all of the parameters
that the currnt query string includes - useful for retaining library
search scope, etc. However, searches for authors that are launched by
clicking on the author's name in the search results page / record
details were failing in many cases because the "page" parameter came
along with it - and if there weren't five pages of results for page=5,
for example, then no hits would be shown.

This commit removes the page param from the URL. In other places, all of
the params are stripped (see cnbrowse) but as I assume we want to retain
search scope and potentially other parameters, we'll start with the
smallest possible change.

Signed-off-by: Dan Scott <dscott@laurentian.ca>
12 years agoMark a string for i18n support in the TPAC
Dan Scott [Wed, 17 Aug 2011 20:43:46 +0000 (16:43 -0400)]
Mark a string for i18n support in the TPAC

Even alt strings deserve translation support...

Signed-off-by: Dan Scott <dscott@laurentian.ca>
12 years agoEscape TPAC "myopac" output to protect against XSS attacks
Dan Scott [Wed, 17 Aug 2011 19:36:15 +0000 (15:36 -0400)]
Escape TPAC "myopac" output to protect against XSS attacks

We're using the Template::Toolkit html and uri filters to ensure that
the usual suspects are escaped at output time to prevent trivial XSS
attacks.

berick: did some merge cleanup

Signed-off-by: Dan Scott <dscott@laurentian.ca>
12 years agoAssume username, not barcode, in TPAC login
Dan Scott [Wed, 17 Aug 2011 17:01:08 +0000 (13:01 -0400)]
Assume username, not barcode, in TPAC login

In the absence of a barcode regex OU setting (opac.barcode_regex), the
TPAC was assuming that the entered value was a barcode. However, the
default JSPAC assumption was that the entered value was a username. This
commit makes the TPAC continue to function with the same assumptions as
the default JSPAC in the absence of a barcode regex OU setting.

Signed-off-by: Dan Scott <dscott@laurentian.ca>
12 years agoTPAC: Strip the "page" GET param from author searches
Dan Scott [Wed, 17 Aug 2011 21:18:54 +0000 (17:18 -0400)]
TPAC: Strip the "page" GET param from author searches

mkurl() generates a URL that, by default, retains all of the parameters
that the currnt query string includes - useful for retaining library
search scope, etc. However, searches for authors that are launched by
clicking on the author's name in the search results page / record
details were failing in many cases because the "page" parameter came
along with it - and if there weren't five pages of results for page=5,
for example, then no hits would be shown.

This commit removes the page param from the URL. In other places, all of
the params are stripped (see cnbrowse) but as I assume we want to retain
search scope and potentially other parameters, we'll start with the
smallest possible change.

Signed-off-by: Dan Scott <dscott@laurentian.ca>
12 years agoTPac: Removed errant 'html' almost-filter
Bill Erickson [Wed, 17 Aug 2011 20:55:43 +0000 (16:55 -0400)]
TPac: Removed errant 'html' almost-filter

Signed-off-by: Bill Erickson <berick@esilibrary.com>
12 years agoTpac: more html output sanitizing
Bill Erickson [Wed, 17 Aug 2011 20:50:50 +0000 (16:50 -0400)]
Tpac: more html output sanitizing

Signed-off-by: Bill Erickson <berick@esilibrary.com>
12 years agoTPac: Removed errant 'html' almost-filter
Bill Erickson [Wed, 17 Aug 2011 20:55:43 +0000 (16:55 -0400)]
TPac: Removed errant 'html' almost-filter

Signed-off-by: Bill Erickson <berick@esilibrary.com>
12 years agoTpac: more html output sanitizing
Bill Erickson [Wed, 17 Aug 2011 20:50:50 +0000 (16:50 -0400)]
Tpac: more html output sanitizing

Signed-off-by: Bill Erickson <berick@esilibrary.com>
12 years agoMark a string for i18n support in the TPAC
Dan Scott [Wed, 17 Aug 2011 20:43:46 +0000 (16:43 -0400)]
Mark a string for i18n support in the TPAC

Even alt strings deserve translation support...

Signed-off-by: Dan Scott <dscott@laurentian.ca>
12 years agoTpac: more html output scrubbing
Bill Erickson [Wed, 17 Aug 2011 19:45:44 +0000 (15:45 -0400)]
Tpac: more html output scrubbing

Signed-off-by: Bill Erickson <berick@esilibrary.com>
12 years agoTpac: more html output scrubbing
Bill Erickson [Wed, 17 Aug 2011 19:45:44 +0000 (15:45 -0400)]
Tpac: more html output scrubbing

Signed-off-by: Bill Erickson <berick@esilibrary.com>
12 years agoEscape TPAC "myopac" output to protect against XSS attacks
Dan Scott [Wed, 17 Aug 2011 19:36:15 +0000 (15:36 -0400)]
Escape TPAC "myopac" output to protect against XSS attacks

We're using the Template::Toolkit html and uri filters to ensure that
the usual suspects are escaped at output time to prevent trivial XSS
attacks.

Signed-off-by: Dan Scott <dscott@laurentian.ca>
12 years agoTPac: more aggressive dynamic output filtering
Bill Erickson [Wed, 17 Aug 2011 19:28:53 +0000 (15:28 -0400)]
TPac: more aggressive dynamic output filtering

Making heavier user of html/uri filters to prevent accidental or
malicious rendering of html from dynamic data.  More to follow.

Signed-off-by: Bill Erickson <berick@esilibrary.com>
12 years agoTPac: more aggressive dynamic output filtering
Bill Erickson [Wed, 17 Aug 2011 19:28:53 +0000 (15:28 -0400)]
TPac: more aggressive dynamic output filtering

Making heavier user of html/uri filters to prevent accidental or
malicious rendering of html from dynamic data.  More to follow.

Signed-off-by: Bill Erickson <berick@esilibrary.com>
12 years agoAssume username, not barcode, in TPAC login
Dan Scott [Wed, 17 Aug 2011 17:01:08 +0000 (13:01 -0400)]
Assume username, not barcode, in TPAC login

In the absence of a barcode regex OU setting (opac.barcode_regex), the
TPAC was assuming that the entered value was a barcode. However, the
default JSPAC assumption was that the entered value was a username. This
commit makes the TPAC continue to function with the same assumptions as
the default JSPAC in the absence of a barcode regex OU setting.

Signed-off-by: Dan Scott <dscott@laurentian.ca>
12 years agoVandelay: don't clear item import profile when creating new queue
Bill Erickson [Wed, 17 Aug 2011 13:17:17 +0000 (09:17 -0400)]
Vandelay: don't clear item import profile when creating new queue

This avoids the problem of: enter import-profile in the UI => enter name for
new queue => profile is cleared.  Import profile is still cleared/set when
an existing queue is selected, since existing queues already have an
item import profile set.

Part II of 90a7bde48a6ef5f7be73375612b5db88f8b31c95

Signed-off-by: Bill Erickson <berick@esilibrary.com>
12 years agoAddress ISBN issues in T-PAC
Dan Scott [Tue, 16 Aug 2011 20:44:16 +0000 (16:44 -0400)]
Address ISBN issues in T-PAC

A few problems fixed here:

* Refer to args.isbns (plural) consistently; at times we were referring
  to args.isbn which did not exist
* Grab the textContent of the SFX ISBN node rather than the raw
  XML::LibXML Element
* Use an assignment operation when regex'ing the SFX ISBN, as the
  in-place was interpreted as a "print me" stmt and displaying the raw
  SFX ISBN.

Signed-off-by: Dan Scott <dscott@laurentian.ca>
12 years agoT-PAC: Do not display a call number if we don't have one
Dan Scott [Tue, 16 Aug 2011 20:02:17 +0000 (16:02 -0400)]
T-PAC: Do not display a call number if we don't have one

Electronic records might not have a call number, so don't try to display
one if there isn't one (in search results).

Signed-off-by: Dan Scott <dscott@laurentian.ca>
12 years agoMerge branch 'collab/berick/template-toolkit-opac-master-merge' of git.evergreen...
Bill Erickson [Tue, 16 Aug 2011 19:33:03 +0000 (15:33 -0400)]
Merge branch 'collab/berick/template-toolkit-opac-master-merge' of git.evergreen-ils.org:working/Evergreen into template-toolkit-opac-master-merge

12 years agoTTPac: another merge casulty -> title_extended attribute
Bill Erickson [Tue, 16 Aug 2011 19:32:57 +0000 (15:32 -0400)]
TTPac: another merge casulty -> title_extended attribute

Signed-off-by: Bill Erickson <berick@esilibrary.com>
12 years agoMerge branch 'collab/berick/template-toolkit-opac-master-merge' of git.evergreen...
Dan Scott [Tue, 16 Aug 2011 19:11:49 +0000 (15:11 -0400)]
Merge branch 'collab/berick/template-toolkit-opac-master-merge' of git.evergreen-ils.org:working/Evergreen into dbs/ttopac-master-merge

12 years agoDelete templates_kcls from core
Dan Scott [Tue, 16 Aug 2011 19:09:58 +0000 (15:09 -0400)]
Delete templates_kcls from core

The KCLS templates, while a useful demonstration of how to skin the
T-PAC, should be maintained outside of the core repository as they
contain branding elements, etc, that are specific to KCLS.

Signed-off-by: Dan Scott <dscott@laurentian.ca>
12 years agoTTPac: move some templates into the right place
Bill Erickson [Tue, 16 Aug 2011 19:09:50 +0000 (15:09 -0400)]
TTPac: move some templates into the right place

Signed-off-by: Bill Erickson <berick@esilibrary.com>
12 years agoMerged esi/template-toolkit-opac and repaired some merge conflicts
Bill Erickson [Tue, 16 Aug 2011 15:34:11 +0000 (11:34 -0400)]
Merged esi/template-toolkit-opac and repaired some merge conflicts

Note to self: the simple/detail view options on the results page will
need some tweaking, particularly since many/most will want to see the
detail view by default.

Signed-off-by: Bill Erickson <berick@esilibrary.com>
12 years agoLP 799719: Pass the DESTDIR variable to python installer
Dan Scott [Tue, 16 Aug 2011 15:50:45 +0000 (11:50 -0400)]
LP 799719: Pass the DESTDIR variable to python installer

Based on Ben Webb's patch, but using the same triple-slash to avoid any
possibility of confusion about the installation location (see also the
same adjustment made to OpenSRF).

Signed-off-by: Dan Scott <dscott@laurentian.ca>
12 years agoOpps ... use the correct number
Mike Rylander [Tue, 16 Aug 2011 15:19:35 +0000 (11:19 -0400)]
Opps ... use the correct number

Signed-off-by: Mike Rylander <mrylander@gmail.com>
12 years agoMerge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac...
Bill Erickson [Tue, 16 Aug 2011 15:14:41 +0000 (11:14 -0400)]
Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac-master-merge

12 years agoStamped upgrade scripts for LP#790329
Mike Rylander [Tue, 16 Aug 2011 15:10:44 +0000 (11:10 -0400)]
Stamped upgrade scripts for LP#790329

Signed-off-by: Mike Rylander <mrylander@gmail.com>
12 years agoLP#790329 org_lasso search is broken
Dan Scott [Thu, 28 Jul 2011 18:29:48 +0000 (14:29 -0400)]
LP#790329 org_lasso search is broken

Fix the JavaScript error when we attempt to create a feed for the
shortname of the org_unit_lasso (lassos have no shortname) - which lets
the request hit the backend Perl module, which in turn chokes on a test
for OU that only allows two conditions: either all digits is treated as
a numeric ID for an org unit, or it is a shortname. Of course, lassos
are negative integers, so we have to modify the test slightly to make it
happier.

There was no depth for org lasso copy counts, and this was handled
correctly in the main case by the asset.opac_lasso_record_copy_count()
function and its staff variant, but when a copy was not found at a given
org_unit in the lasso a request was made for the non-existent depth and
the function would error out.

Signed-off-by: Dan Scott <dscott@laurentian.ca>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
12 years agoPlaceholder for 2.0-only LP#790329 fix
Mike Rylander [Tue, 16 Aug 2011 15:08:02 +0000 (11:08 -0400)]
Placeholder for 2.0-only LP#790329 fix

Signed-off-by: Mike Rylander <mrylander@gmail.com>
12 years agoVandelay: don't clear match-set when creating new queue
Bill Erickson [Tue, 16 Aug 2011 14:55:39 +0000 (10:55 -0400)]
Vandelay: don't clear match-set when creating new queue

This avoids the problem of: enter match set in the UI => enter name for
new queue => match set is cleared.  Match set is still cleared/set when
an existing queue is selected, since existing queues already have a
match set.

Signed-off-by: Bill Erickson <berick@esilibrary.com>
12 years agoKeep the logging output of the EDI translator by default
Lebbeous Fogle-Weekley [Tue, 16 Aug 2011 13:10:45 +0000 (09:10 -0400)]
Keep the logging output of the EDI translator by default

There is valuable troubleshooting information there that is otherwise hard to
find.  This particularly matters when the output of an EDI
Action/Trigger template (JEDI) doesn't successfully get translated to
EDIFACT for nonobvious reasons.

In production environments, you might instead pipe to logger so that you can
collect output with syslog, rather than in a flat file.  As long as
output goes *somewhere.*

Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
12 years agoLP#820409 fix org unit admin UI
Jason Etheridge [Mon, 15 Aug 2011 19:34:07 +0000 (15:34 -0400)]
LP#820409 fix org unit admin UI

This reverts part of 17e659eec3e23caf5d301b33aa5019b672ecd0e8, which was
tightening checks against null and '' to avoid implicit type-casting.

This line var modified_ou = new aou().fromStoreItem( current_ou ); was
producing a fieldmapper object where certain fields were being set to
contain the string "undefined" rather than a null.

The update method would take isdeleted == "undefined" as True.

Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
12 years agoStamped upgrades for LP#825303
Mike Rylander [Tue, 16 Aug 2011 13:00:43 +0000 (09:00 -0400)]
Stamped upgrades for LP#825303

Signed-off-by: Mike Rylander <mrylander@gmail.com>
12 years agoreturn only the one applicable OU setting value
Galen Charlton [Fri, 12 Aug 2011 20:09:11 +0000 (16:09 -0400)]
return only the one applicable OU setting value

Correct actor.org_unit_ancestor_setting so that it returns
at most one setting value, rather than the entire set
 of values defined for the OU and its ancestors.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
12 years agolp#825303: fix cat.default_classification_scheme lookup
Galen Charlton [Fri, 12 Aug 2011 16:18:54 +0000 (12:18 -0400)]
lp#825303: fix cat.default_classification_scheme lookup

Fixes a bug where the wrong default classification scheme
could be chosen when adding a new volume whose classification
scheme was not explicitly set.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
12 years agoTTPac: Hide pagination for 1-page hits
Bill Erickson [Tue, 16 Aug 2011 12:24:38 +0000 (08:24 -0400)]
TTPac: Hide pagination for 1-page hits

Signed-off-by: Bill Erickson <berick@esilibrary.com>
12 years agoTTpac: added simple/detailed record view option to results page
Bill Erickson [Mon, 15 Aug 2011 21:38:12 +0000 (17:38 -0400)]
TTpac: added simple/detailed record view option to results page

Signed-off-by: Bill Erickson <berick@esilibrary.com>
12 years agoTTPac: move results pageing chunk to new template
Bill Erickson [Mon, 15 Aug 2011 18:56:50 +0000 (14:56 -0400)]
TTPac: move results pageing chunk to new template

table.tt2 and paging are complex enough and will likely result in much
local customization.  Break them up into 2 page to simplify.

Signed-off-by: Bill Erickson <berick@esilibrary.com>
12 years agoTTpac: show page range in results paging display
Bill Erickson [Mon, 15 Aug 2011 18:42:45 +0000 (14:42 -0400)]
TTpac: show page range in results paging display

Signed-off-by: Bill Erickson <berick@esilibrary.com>
12 years agoTTPac: change default any-format to 'All Formats'
Bill Erickson [Mon, 15 Aug 2011 15:28:19 +0000 (11:28 -0400)]
TTPac: change default any-format to 'All Formats'

Signed-off-by: Bill Erickson <berick@esilibrary.com>
12 years agoTTpac: option to override no-choice label in coded value selector
Bill Erickson [Mon, 15 Aug 2011 15:28:01 +0000 (11:28 -0400)]
TTpac: option to override no-choice label in coded value selector

Signed-off-by: Bill Erickson <berick@esilibrary.com>
12 years agoTTpac: Chilifresh reviews panel occupies the width of the table
Bill Erickson [Mon, 15 Aug 2011 15:18:33 +0000 (11:18 -0400)]
TTpac: Chilifresh reviews panel occupies the width of the table

Signed-off-by: Bill Erickson <berick@esilibrary.com>
12 years agoStamped upgrade script for "lp 823496: do not fail to index personal names that have...
Mike Rylander [Sat, 13 Aug 2011 01:07:41 +0000 (21:07 -0400)]
Stamped upgrade script for "lp 823496: do not fail to index personal names that have relators"

Signed-off-by: Mike Rylander <mrylander@gmail.com>
12 years agolp 823496: don't fail to index personal names that have relators
Galen Charlton [Tue, 9 Aug 2011 19:30:56 +0000 (15:30 -0400)]
lp 823496: don't fail to index personal names that have relators

The default definition for the author|other index inadvertantly
excluded names from 600, 700, 720, and 800 fields that have
relator values ($e) or codes ($4).

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
12 years agoVandelay: capture one match per catalog record
Bill Erickson [Fri, 12 Aug 2011 21:03:11 +0000 (17:03 -0400)]
Vandelay: capture one match per catalog record

When searching for matches to existing catalog records
(biblio.record_entry's), Vandelay can in some cases result in multiple
like matches for the same record (with the same match score).  This
trims it down to 1 match per record.

Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
12 years agoAdd some additional logging in SIP/Transaction/Feepayment.pm.
Jason Stephenson [Thu, 4 Aug 2011 20:02:15 +0000 (16:02 -0400)]
Add some additional logging in SIP/Transaction/Feepayment.pm.

This should help with debugging, etc.

Signed-off-by: Jason Stephenson <jstephenson@mvlc.org>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
12 years agoAdd OILS_SIP_MSG_BILL_ERR for when an error occurs getting bills.
Jason Stephenson [Thu, 4 Aug 2011 16:31:49 +0000 (12:31 -0400)]
Add OILS_SIP_MSG_BILL_ERR for when an error occurs getting bills.

Signed-off-by: Jason Stephenson <jstephenson@mvlc.org>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
12 years agoAdd event textcode as alternative to descr in FeePayment.pm.
Jason Stephenson [Thu, 14 Jul 2011 17:59:47 +0000 (13:59 -0400)]
Add event textcode as alternative to descr in FeePayment.pm.

Some events have no descr, it seems.

Signed-off-by: Jason Stephenson <jstephenson@mvlc.org>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
12 years agoBail from fee payment if no bills are found.
Jason Stephenson [Wed, 13 Jul 2011 22:28:26 +0000 (18:28 -0400)]
Bail from fee payment if no bills are found.

Signed-off-by: Jason Stephenson <jstephenson@mvlc.org>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
12 years agoAdd SIP2 fee payment, the 37/38 message/response pairs.
Jason Stephenson [Thu, 30 Jun 2011 15:48:28 +0000 (11:48 -0400)]
Add SIP2 fee payment, the 37/38 message/response pairs.

* Pay individual bill if a fee id is given by the SC.

* Pay multiple bills in batch so if one fails the whole transaction
  is aborted and a failure response is sent to the SC.

* Reject payments outright if the SC sends an overpayment.

* Add constants for bill not found and overpayment messages.

* Whole lotta logging goin' on (maybe too much).

Signed-off-by: Jason Stephenson <jstephenson@mvlc.org>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
12 years agoDon't escape_html numbers in util/print.js
Thomas Berezansky [Fri, 12 Aug 2011 19:47:25 +0000 (15:47 -0400)]
Don't escape_html numbers in util/print.js

Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
12 years agoEscape HTML characters in template subs
Thomas Berezansky [Thu, 11 Aug 2011 01:37:54 +0000 (21:37 -0400)]
Escape HTML characters in template subs

This prevents injection of random HTML from various sources.

Like bad bib records, org unit settings, patron info, etc.

Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
12 years agoUse openDialog to make go_print workaround vanish
Thomas Berezansky [Thu, 11 Aug 2011 01:03:46 +0000 (21:03 -0400)]
Use openDialog to make go_print workaround vanish

By passing params and the go_print function into openDialog we get
to ignore race conditions, as the window is created with the passed
in arguments.

Oh, and we can stop using js2JSON and such.

Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
12 years agoAdd openDialog to window class
Thomas Berezansky [Thu, 11 Aug 2011 01:02:51 +0000 (21:02 -0400)]
Add openDialog to window class

Uses window.openDialog instead of window.open.
https://developer.mozilla.org/en/DOM/window.openDialog

Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
12 years agoNo more lightpink for disabled copy editor
Jason Etheridge [Fri, 12 Aug 2011 20:04:43 +0000 (16:04 -0400)]
No more lightpink for disabled copy editor

Folks can still provide custom CSS against those class hooks if desired

Signed-off-by: Jason Etheridge <jason@esilibrary.com>
12 years agoin lieu of Ready Item Editor
Jason Etheridge [Thu, 11 Aug 2011 18:16:24 +0000 (14:16 -0400)]
in lieu of Ready Item Editor

We're trying to prevent folks from using the item attribute editor in the
unified interface when the volume pane is still updating its information
(i.e. building the copies to feed to the attribute editor), so that a
given editing widget isn't ripped out from under staff while its being
used.  This change removes the heavy-handed Ready Item Editor button and
instead tries to more gracefully manage the editor state based on change
and keypress events.  Also change the color scheme for a disabled editor
from red to light pink.

Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
12 years agoStamped upgrade script for "For vandelay bib matching, make 020, 022, 024 tags case...
Mike Rylander [Fri, 12 Aug 2011 19:06:01 +0000 (15:06 -0400)]
Stamped upgrade script for "For vandelay bib matching, make 020, 022, 024 tags case-insensitive"

Signed-off-by: Mike Rylander <mrylander@gmail.com>
12 years agoFor vandelay bib matching, make 020, 022, 024 tags case-insensitive
Lebbeous Fogle-Weekley [Fri, 12 Aug 2011 15:35:16 +0000 (11:35 -0400)]
For vandelay bib matching, make 020, 022, 024 tags case-insensitive

For user convenience.

Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
12 years agoRemoved errant '-' causing sql syntax failure
Bill Erickson [Fri, 12 Aug 2011 12:40:31 +0000 (08:40 -0400)]
Removed errant '-' causing sql syntax failure

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 [Thu, 11 Aug 2011 21:50:09 +0000 (17:50 -0400)]
Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac-master-merge

12 years agoMerge esi/template-toolkit-opac and repaired some conflicts
Bill Erickson [Thu, 11 Aug 2011 21:48:00 +0000 (17:48 -0400)]
Merge esi/template-toolkit-opac and repaired some conflicts

Signed-off-by: Bill Erickson <berick@esilibrary.com>