Thomas Berezansky [Tue, 7 Feb 2012 22:26:03 +0000 (17:26 -0500)]
New Circ Limits
Replace the old "Circ Mod Test" limit system with a more flexible system.
In addition to circ modifiers this system supports "Limit Groups" that are
automatically applied (by default) to any circulation checking them. This
can be overidden by setting the "Check Only" flag when linking a Limit
Group to a Limit Set.
Both the limit groups and circ modifiers are linked to "Limit Sets" that
act similarly to rules. Each Set can be attached to 0 or more circulation
matchpoints.
Each Limit set supports a number of items out (0 replaces infinite), depth
in the org tree to start counting at (0 for up to the top, 1 for 1 below,
etc), and a global flag (to check everywhere below the depth point, rather
than just those circulations that happend at ancestors/descendants).
When a Limit Set is linked to a Circulation Matchpoint it can be made
inactive and has a fallthrough flag. When the fallthrough flag is enabled
the Limit Set will be used whenever the matchpoint is involved with making
a decision. When it is disabled the Limit Set will only be used when the
matchpoint is the most specific matchpoint used in making the decision.
Limit Groups management can be found on the server administration menu.
Limit Sets management can be found on the local administration menu.
Limit Set -> Matchpoint linking is done via editing Circulation Policies.
The upgrade script does not remove the old tables in case something goes
wrong with migrating the information contained within them.
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Conflicts:
Open-ILS/web/opac/locale/en-US/lang.dtd
Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul
Signed-off-by: Jason Stephenson <jstephenson@mvlc.org>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Thomas Berezansky [Tue, 31 Jan 2012 15:48:25 +0000 (10:48 -0500)]
Fix inability to suspend holds
The hold status code was being used for "has the hold been captured", but
the value for "frozen" was after the cutoff being assumed for "captured".
So check for the suspended code specifically in the if, and don't return
the suspended code if there is a capture time.
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Mike Rylander [Fri, 24 Feb 2012 18:40:06 +0000 (13:40 -0500)]
Correctly quote regexp-y characters in phrase quoting helper
There was one extra character that caused the use of quotemeta() to not
actually happen. This broke two things:
1) phrase searching when the phrase had certain special characters in it
-- test case: "c++"
2) use of relevance bumps in the same situation
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Thomas Berezansky [Wed, 15 Feb 2012 20:36:58 +0000 (15:36 -0500)]
Re-enable use of BAR_PATRON and UNBAR_PATRON perms
If you aren't allowed to bar/unbar at the patron's home library then:
1 - Disable the checkbox as appropriate
2 - Disallow on the backend too
The frontend only checks on page load. The backend checks the old patron on
update and the new patron on create.
This does not stop "change home library to me, bar/unbar, change back" if
otherwise able to change the patron's home library.
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Thomas Berezansky [Mon, 30 Jan 2012 18:34:53 +0000 (13:34 -0500)]
Stop targeter crash on empty metarecord with holds
By checking for 1 or more records before looking them up.
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Ben Shum <bshum@biblio.org>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Bill Erickson [Wed, 15 Feb 2012 22:07:24 +0000 (17:07 -0500)]
Update pickup lib from holds shelf status test repair
When determining whether a hold is getting updated while already on the
holds shelf, it's important to also treat hold status 5 as an on-shelf
status. Status 5 comes into play when the circ.hold_shelf_status_delay
org unit setting is activated and acts as a virtual status indicating
the item is physically en route to the shelf.
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Lebbeous Fogle-Weekley [Wed, 2 Nov 2011 16:23:47 +0000 (12:23 -0400)]
Acq: minor usability improvements to receiving copies from invoice
1) Show an "X out of Y copies received" message near the top of the
display.
2) Provide a button to return to the primary interface for invoice view.
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Mike Rylander [Mon, 20 Feb 2012 19:24:49 +0000 (14:24 -0500)]
Stamping autosuggest upgrade script
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Lebbeous Fogle-Weekley [Mon, 13 Feb 2012 19:57:39 +0000 (14:57 -0500)]
AutoSuggest: prevent building a bad tsquery when user types leading spaces
The problem used to bubble up and manifest as an Apache 500 error for
the user.
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Lebbeous Fogle-Weekley [Mon, 13 Feb 2012 19:37:18 +0000 (14:37 -0500)]
AutoSuggest: more UI tweaks regarding typing after selecting
Avoid highlighting text in the textbox part of the autosuggest widget,
so that if the user wants to type more after selecting a suggestion with the
arrow keys, s/he doesn't clobber the existing part.
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Lebbeous Fogle-Weekley [Mon, 13 Feb 2012 17:53:20 +0000 (12:53 -0500)]
AutoSuggest: Make directly clicking a suggestion initiate search
Formerly, I thought it best not to do this, so that users could choose a
suggestion and refine their search term further, but that put the
widget's behavior at odds with that of certain ubiquitous search
engines.
Users can still highlight a suggestion and press tab to modify their
search further before submitting, if they wish (and if they know this or
figure it out somehow).
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Lebbeous Fogle-Weekley [Fri, 27 Jan 2012 19:15:26 +0000 (14:15 -0500)]
AutoSuggest
Get an autocompleting dialog underneath basic search boxes.
If activated, the dialog appears in both the JavaScript OPAC and the Template
Toolkit OPAC.
Mike Rylander and Bill Erickson largely designed and spec'ed out this
feature, especially at the database level. Lebbeous Fogle-Weekley and
Mike Rylander did the programming.
How it works, for site administrators
-------------------------------------
Once the code is installed, including database stored procedures,
(re)ingesting your bibliographic records will populate two new tables
needed by AutoSuggest: metabib.browse_entry and metabib.browse_entry_def_map.
Yes, for now this means that the size of your database in per-record terms
will be greater. The browse_entry data we generate is extremely similar to
facet data, so it's possible that in the future we can blend them into the
same thing at the database level, and save some space.
To control what gets indexed in the metabib.browse_* tables, set the
boolean 'browse_field' column for each row in config.metabib_field as desired
Numbers 15 (keyword|keyword) and 16 (subject|complete) should generally be set
to false.
The config.metabib_class table has a new 'bouyant'
column. Setting this to true means that when a user is typing in the OPAC
search box with a search class selector set to, say, 'Subject', and the cmc row
for 'Subject' has 'bouyant' set to true, the top suggestions will definitely
come from the Subject fields of MARC records (if any). 'restrict' is like
'bouyant', only stronger. In that case suggestions /only/ come from the
selected class.
This is the idea behind the 'restrict' column (in both the
config.metabib_class table and the config.metabib_field table):
For any given class or field, if restrict is true AND the user at the OPAC
has selected that same class or field from the search class dropdown, then
autosuggestions will only come from that class or field in the record.
You never want this column to be true for keyword, because we don't index
keywords for browse/autosuggest purposes (we would get giant blobs of
information as autosuggestions, and you don't want that (really)).
You don't really want it to be true for most classes and fields.
If the user sets the dropdown to "subject" and start typing "harry potter",
the user really wants matches from the "title" class too (although other
things being equal, matches from the "subject" class will rise to the top).
If you have a speciality index, you *may* want to set restrict to true
for that particular field. For a song title index, for example. To take
advantage of this, you would also have to customize your OPAC to have an
entry in the search class dropdown for 'title|songtitle' (or whatever's
appropriate for your specialty index). This is easy to do and should be
covered somewhere in documentation for both the JSPAC and the TPAC.
The order of suggestions otherwise has mostly to do with how well what users
have typed matches what's in your bib records, and the value of the weight
column of the relevant config.metabib_field row. Examine the code if you're
curious to know more or want to make adjustments.
The master on/off switch for AutoSuggest is a new row in in config.global_flag
named 'opac.use_autosuggest'. Set its 'enabled' column to false to turn
off AutoSuggest. If you don't want your suggestions to be limited to whatever's
OPAC visible at the search org, set the 'value' column to anything that
does not contain the string 'opac_visible'. This could be a good idea
if AutoSuggest seems slow on a large site.
Turning this on means introducing Dojo in your TPAC. I tried to
keep it minimal, for load time's sake. There's no fieldmapper or IDL stuff
play. For now, turning this feature off will avoid loading Dojo in your
TPAC.
Managing the little stuff
-------------------------
CSS classes that affect the look of suggestions are in this file for the TPAC:
Open-ILS/web/css/skin/default/opac/style.css
and in this file for the JSPAC:
Open-ILS/web/opac/skin/default/css/layout.css
At bottom, autosuggest is shaped by PostgreSQL's Full Text Search features.
Some of the arguments that are passed to TS_RANK_CD() and TS_HEADLINE() are
expoposed via options to the openils.widget.AutoSuggest and
openils.AutoSuggestStore modules, which have comments. You can customize your
OPAC files to invoke these with your desired options without touching much
actual code.
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Dan Wells [Tue, 14 Feb 2012 16:09:41 +0000 (11:09 -0500)]
Correct special winter handling in predictions
The current serials prediction code has an exception for handling
cases where 'Winter 2010' is followed by 'Spring 2010' rather than
'Spring 2011'. This exception assumed the more common case of a
combined subfield $y, e.g.:
$yps21,22,23,24
In doing so, it incorrectly handled less common cases where the $y
is listed separately:
$yps21$yps22$yps23$yps24
This change (with test data) ensures we only check the first $y
for our 'early winter' exception.
Signed-off-by: Dan Wells <dbw2@calvin.edu>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Dan Scott [Thu, 16 Feb 2012 17:49:54 +0000 (12:49 -0500)]
Escape content when generating DTD for fieldmapper
Noticed by Thomas Berezansky, if a translation in a PO or POT file
contains an unescaped left angle bracket, a DTD will be generated that
contains the unescaped left angle bracket - and that isn't valid.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Lebbeous Fogle-Weekley [Tue, 14 Feb 2012 16:18:27 +0000 (11:18 -0500)]
Vandelay record match sets: fix bug loading some trees
Reported to me by Bill Erickson. The Vandelay Record Match Sets
interface was failing to load some simple trees of match set points.
Example: http://pastesite.com/31643
The proximate symptom was this error message:
Error: dojo.data.ItemFileReadStore: Invalid item argument.
Source File: http://dev198.esilibrary.com/js/dojo/dojo/dojo.js
Line: 119
but the root cause was a problem in dojoize_match_set_tree(), which
was failing to generate unique identifiers for each item in the data
store it's responsible for generating.
Since that function is only ever used to deal with trees where all the
nodes come from the database and have actual IDs, that function now uses
the database IDs as is rather than attempting to generate new ones.
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Dan Scott [Tue, 14 Feb 2012 16:45:18 +0000 (11:45 -0500)]
Fix typos in lp820006 that broke clean schema creation
Backslashes to escape single quotes in SQL aren't cool.
Also, lists of rows to insert need commas as delimiters.
Also, needed a trailing "]" on the 90-day lost notice template.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Tue, 14 Feb 2012 16:12:19 +0000 (11:12 -0500)]
Fix up 3-day courtesy notice with better title / author too
Use the helper function to get better quality title/author out of the
target copy for pre-due notices.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Steven Callender [Tue, 2 Aug 2011 19:38:42 +0000 (19:38 +0000)]
LP#820006: Action trigger notices fixes
Cleaned up action triggers a little bit.
1. Added the editor param to the auto lost, because triggers will fail
without this.
2. Also removed the use of simple_records in some of the notices and
changed it to something more efficient.
3. Changed the use of total money owed to balance owed.
Signed-off-by: Steven Callender <stevecallender@esilibrary.com>
Signed-off-by: Dan Scott <dan@coffeecode.net>
Bill Erickson [Wed, 4 Jan 2012 18:03:01 +0000 (13:03 -0500)]
TPac: facet display filtering and sorting
Provides the ability (via config.tt2) to define which facets should
display and the order of facet display. The behavior is consistent with
the openils.widget.FacetSidebar Dojo class, used in JSPAC.
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Jason Stephenson <jstephenson@mvlc.org>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Lebbeous Fogle-Weekley [Wed, 1 Feb 2012 23:11:52 +0000 (18:11 -0500)]
Booking: make pick up interface show resources captured for reservation ...
... even beyond the first day of the reservation. I can think of no
reason why this limitation existed in the first place.
Also, just replace naive_start_of_day() with "today"
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Mike Rylander [Mon, 17 Oct 2011 16:27:04 +0000 (12:27 -0400)]
Stream results from targetable holds list retrieval
Tested and slightly modified patch from Mike R. to improve multi-session
hold targeting. This patch includes an update to the targetable holds
API call to stream results instead of returning them in 1 big chunk,
which has been known to result in messages too large for jabber
(max_stanza_size). hold_targer.pl is updated to handle the stream.
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Bill Erickson [Wed, 8 Feb 2012 15:32:44 +0000 (10:32 -0500)]
Stamping upgrade for LP#928896
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Galen Charlton [Wed, 8 Feb 2012 15:01:24 +0000 (10:01 -0500)]
LP#928896 improve row estimate for action.usr_visible_circ_copies()
Fixes problem where use of this function by the tagging circs in search
results feature can result in sequential scans of asset.call_number.
Thanks to Mike Rylander for the suggestion.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Lebbeous Fogle-Weekley [Fri, 27 Jan 2012 14:09:08 +0000 (09:09 -0500)]
JSON_v0 has been superseded, and it has insidious bugs anyway.
For example, you cannot round-trip this through JSON2js() and js2JSON()
in IE8: http://paste.lisp.org/display/127338
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Michael Peters [Thu, 2 Feb 2012 16:58:01 +0000 (11:58 -0500)]
Tweak the opac-button elements to avoid blending with backgrounds
Signed-off-by: Michael Peters <mrpeters@library.in.gov>
Signed-off-by: Dan Wells <dbw2@calvin.edu>
Michael Peters [Thu, 2 Feb 2012 15:27:35 +0000 (10:27 -0500)]
Tweak style.css to bring facet headers into sync with color scheme
Signed-off-by: Michael Peters <mrpeters@library.in.gov>
Signed-off-by: Dan Wells <dbw2@calvin.edu>
Thomas Berezansky [Wed, 1 Feb 2012 19:16:53 +0000 (14:16 -0500)]
Fix HoldIsAvailable validator
Depending on the environment some things may be ids or references.
Comparisons should try and use the IDs only, so pull the IDs out.
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Lebbeous Fogle-Weekley [Wed, 1 Feb 2012 21:58:45 +0000 (16:58 -0500)]
TPAC: Avoid hold placement problems à la
80d5c4a4
A commit written in October and merged quickly (
80d5c4a4) was designed
to avoid problems with a middle layer method that sometimes returns hash
refs and sometimes returns array refs.
A commit written in September but not merged until January (
a663dfed)
affected neighboring code, but was not aware of the other code to dance
around hash refs and array refs (just read the commit messages of each
to see what I mean, with attention to the changes in
WWW/EGCatLoader/Account.pm).
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Thomas Berezansky [Mon, 30 Jan 2012 22:15:44 +0000 (17:15 -0500)]
Re-teach the clear shelf process "one copy"
It got lost when fetching holds was abstracted out.
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Lebbeous Fogle-Weekley [Tue, 31 Jan 2012 19:56:56 +0000 (14:56 -0500)]
Upgrade script finalization, adding new perm to database
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Jason Etheridge [Thu, 5 Jan 2012 22:40:48 +0000 (17:40 -0500)]
remove this old speedbump, which now lies
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Jason Etheridge [Thu, 5 Jan 2012 22:26:06 +0000 (17:26 -0500)]
Improve COPY_DELETE_WARNING event handling
Make it overridable in copy buckets, and let Cancel on perm denied dialog fail gracefully.
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Jason Etheridge [Thu, 5 Jan 2012 22:23:39 +0000 (17:23 -0500)]
Use the restrict_copy_delete field on copy status
to determine when to throw a COPY_DELETE_WARNING event
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Jason Stephenson [Wed, 12 Oct 2011 13:38:53 +0000 (09:38 -0400)]
Add upgrade script for config.copy_status.restrict_copy_delete.
Adds the column to the config.copy_status table.
Updates the "magical" statues (1,3,6,8) to have restrict_copy_delete
set to TRUE.
Signed-off-by: Jason Stephenson <jstephenson@mvlc.org>
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Jason Stephenson [Wed, 12 Oct 2011 13:19:49 +0000 (09:19 -0400)]
Add restrict_copy_delete field to config.copy_status.
Add the column definition in 002.schema.config.sql.
Add the field to the class ccs in fm_IDL.xml.
Set the restrict_copy_delete column to true for the "magical"
statuses (1,3,6,8) in 950.data.seed-values.sql.
Add restrict_delete as essential column to config.copy_status in
OpenILS::Application::Storage::CDBI::config
Signed-off-by: Jason Stephenson <jstephenson@mvlc.org>
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Jason Etheridge [Thu, 19 Jan 2012 22:01:22 +0000 (17:01 -0500)]
Handle search timeouts more gracefully
Another tweak courtesy of berick
Returns 0 results if open-ils.storage timeouts instead of a nasty uncaught
undefined ARRAY exception resulting in an OPAC "spinning wheel of death"
(formerly the "green knight rider bar of death".
Note that in the event of storage timeouts, you should tune and/or beef-up
your database.
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Bill Erickson [Wed, 23 Nov 2011 15:23:58 +0000 (10:23 -0500)]
Example Evergreen rsyslog configuration file
This differs from the OpenSRF sample configuration by adding a log file
for Postgres and by changing the log path to /var/log/evergreen
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Bill Erickson [Mon, 23 Jan 2012 20:00:45 +0000 (15:00 -0500)]
TPac: Avoid long-running, unintended empty searches
If a page that executes a search is accessed with no viable search
query, cut the search short to avoid meaningless, long-running searches.
This primarily affects direct links to record detail pages. For
example:
http://example.org/eg/opac/record/123
The RD page attempts to load the currrently active search (for paging) and,
if there is no query, will search for strings like 'site(BR1) depth(2)',
which are unintended and quite slow, which delays page rendering.
---
While we're in there, let's silence the following Apache error log
warning by ensuring that int() gets a value.
Use of uninitialized value in int at
/usr/local/share/perl/5.10.1/OpenILS/WWW/EGCatLoader/Search.pm line 192.
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Bill Erickson [Mon, 23 Jan 2012 22:04:01 +0000 (17:04 -0500)]
TPac: avoid SMS org setting check for non-SMS pages
Avoid an unnecessary org unit setting lookup on a large swath of
(mostly myopac) pages. Instead, check to see if the current page is the
SMS page in question and the lookup is necessary before making the
lookup.
This change also inserts the physical location as the first org unit to
use in the org setting test.
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Lebbeous Fogle-Weekley [Tue, 31 Jan 2012 19:21:01 +0000 (14:21 -0500)]
Missed increment in 002.schema.config.sql for last commit
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Bill Erickson [Thu, 20 Oct 2011 13:06:20 +0000 (09:06 -0400)]
ACQ: remove piles of unused cancel_reasons
There is a large set of of acq.cancel_reason's in Evergreen that come
from the EDI spec and will never be used in practice. Since there are
scenarios where cancel reasons are manually chosen by staff, let's
remove all of the extras so the process of selecting a cancel reason is
not so fraught with "Poultry" and "Airline attendants", etc.
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Dan Scott [Sun, 22 Jan 2012 21:34:31 +0000 (16:34 -0500)]
TPAC: Cleaner title display in simple and detailed views
The TPAC uses a simple 245a display for the "simple view" in search
results, so records like the concerto.sql "Violin concerto no. 3 in G,
K. 216 ;" display with a trailing semicolon that is rather
disconcerting.
Similarly, the subfields in the extended title as displayed in the
record detail view was simply concatenating subfields together. This
resulted in titles like:
Violin concerto no. 3 in G, K. 216 ;Sinfonia ...
rather than:
Violin concerto no. 3 in G, K. 216 ; Sinfonia ...
This commit strips trailing punctuation that suggests a continuation
(:;/) from the brief title and joins the subfields with a space for the
extended title.
Also, enable the detailed view in search results to display the complete
title.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Michael Peters [Mon, 30 Jan 2012 18:39:45 +0000 (13:39 -0500)]
Increase the year in copyright statements to 2012
Signed-off-by: Michael Peters <mrpeters@library.in.gov>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Thomas Berezansky [Tue, 24 Jan 2012 15:13:37 +0000 (10:13 -0500)]
Fix fm_IDL.xml validation errors
From 80+ errors to 0!
Remove empty permacrud blocks (and pcrud controllers).
Adds missing attributes, updates xsd to include in-use attributes.
Fixes incomplete attribute names and the occasional typoed name.
Also re-orders some chunks that are controlled by xs:sequence.
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Dan Scott [Sun, 22 Jan 2012 16:42:08 +0000 (11:42 -0500)]
Fix "prefered_language" typo that blocked preferred language
"preferred_language" is used everywhere else, but in the crucial core of
metabib.pm the "prefered_language" variant is used to check on the value
- hence, nothing other than the default "eng" is being used. Fix that.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Jason Stephenson [Mon, 30 Jan 2012 21:38:34 +0000 (16:38 -0500)]
Fix "Add Volumes" entry in "Actions for this Record" menu
A typo in Open-ILS/xul/staff_client/chrome/content/cat/opac.js (cbdObj
instead of cbsObj) led to the exception "Reference error: cbdObj is not
defined" being thrown any time the "Add Volumes" entry was chosen.
Signed-off-by: Jason Stephenson <jstephenson@mvlc.org>
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Lebbeous Fogle-Weekley [Mon, 30 Jan 2012 22:16:08 +0000 (17:16 -0500)]
Merge remote branch 'working/user/dbs/fix-nonfiling-titles'
Conflicts:
Open-ILS/src/sql/Pg/950.data.seed-values.sql
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Thomas Berezansky [Mon, 30 Jan 2012 15:09:17 +0000 (10:09 -0500)]
Fix "Clear Shelf Expired Holds" checkin modifier
By not looking up empty arrays there either.
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Thomas Berezansky [Mon, 30 Jan 2012 13:52:37 +0000 (08:52 -0500)]
Fix SIP2 "unavailable holds" check
If no IDs, don't look up an empty array of IDs.
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Dan Wells [Fri, 20 Jan 2012 22:58:01 +0000 (17:58 -0500)]
Merge branch 'master' of git.evergreen-ils.org:Evergreen
Michael Peters [Fri, 20 Jan 2012 22:49:16 +0000 (17:49 -0500)]
Modifications to the TTPac color scheme to be more with logo guidelines
Tweaked the buttons, gradients, etc. in TTPac to eradicate the blue/grey elements.
Began with the Evergreen Logo's official color (Pantone 340 as found at http://www.georgialibraries.org/lib/pines/evergreenlogo/)
and complimented the colors accordingly, replacing dark blues with dark greens, light blues with light greens, etc.
This also adds two new selectors in styles.css to control the logo placement. Logos were also centered on the page, rather than being crowded
into neighboring elements.
Signed-off-by: Michael Peters <mrpeters@library.in.gov>
Fixed Conflicts:
Open-ILS/web/css/skin/default/opac/semiauto.css
Open-ILS/web/css/skin/default/opac/style.css
Signed-off-by: Dan Wells <dbw2@calvin.edu>
Jason Etheridge [Mon, 9 Jan 2012 20:18:15 +0000 (15:18 -0500)]
Fix self-fetching callnumber columns
The callnumber (and related) columns from circ.util.columns() is meant to
retrieve call number objects if given call number id's instead of objects,
but there was a bug preventing that.
This fixes LP#906523, no call number information in billing interface
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
James Fournie [Wed, 7 Dec 2011 19:27:45 +0000 (11:27 -0800)]
Acq fix for LP#901378
Proratable invoice charges do not have a fund_debit, we need to check for
this before attempting to delete the charge. If there's no fund_debit
we can generally assume that there's no corresponding debit to this charge
and skip trying to delete it.
Signed-off-by: James Fournie <jfournie@sitka.bclibraries.ca>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Bill Erickson [Fri, 20 Jan 2012 20:07:25 +0000 (15:07 -0500)]
Stamping upgrade for copy_location_alert
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Thomas Berezansky [Wed, 18 Jan 2012 16:28:13 +0000 (11:28 -0500)]
Add Checkin Alert to Copy Locations
If enabled bring up a ROUTE TO prompt for the location at reshelving time.
Also, while at it, add Prefix/Suffix to the "new" section of the editor.
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Bill Erickson [Fri, 20 Jan 2012 19:58:05 +0000 (14:58 -0500)]
Remove RELEASE_NOTES reference from README
...pending further discussion
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Dan Scott [Fri, 23 Dec 2011 17:57:37 +0000 (12:57 -0500)]
Release Notes: Add CC-BY-SA 3.0 license to footer
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Dan Scott [Fri, 23 Dec 2011 17:55:34 +0000 (12:55 -0500)]
Release notes: document copy location display option
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Dan Scott [Wed, 21 Dec 2011 16:56:55 +0000 (11:56 -0500)]
Release notes: document new reporting views
Introduce 'Last Circulation or Creation Date' and 'Hold/Copy Ratio per Bib
and Pickup Library' reporting sources.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Dan Scott [Tue, 20 Dec 2011 16:54:30 +0000 (11:54 -0500)]
Move RELEASE_NOTES into the docs subdirectory
We will begin maintaining release notes inside the source directory,
with one RELEASE_NOTES.txt file per major release series (2.2, 2.3,
etc). The release notes will primarily consist of an overview of new
features and important behaviour changes in that particular release
series, as well as a cumulative list of bugs that have been fixed in the
point releases for that series.
Also, mention the existence of the release notes in the top-level
README.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Dan Scott [Mon, 5 Dec 2011 18:56:36 +0000 (13:56 -0500)]
Release notes: "cbs prevents records from having copies"
The new "can_have_copies" column on config.bib_source prevents
associated records from having copies or MFHD records attached via the
staff client.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Dan Scott [Tue, 29 Nov 2011 20:11:55 +0000 (15:11 -0500)]
Note located URI changes in Release Notes
Located URIs now define what org unit and below in the hierarchy will be
matched for a given search scope, rather than the copy-like behaviour
from before; for example, a located URI at BR1 will no longer be found
in a SYS1 search scope; rather, a located URI at SYS1 will be found with
either a SYS1 or a BR1 search scope.
Put some info and rough suggested fix into the release notes.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Jason Etheridge [Wed, 11 Jan 2012 03:15:31 +0000 (22:15 -0500)]
Make Delete User failure overridable
Make mrpeter's new ACTOR_USER_DELETE_OPEN_XACTS event overridable to preserve
existing functionality (the delete user code will wipe out all transactions if
allowed to, and will leave copy statuses as "Checked Out" if needed, which is
okay in EG even if there aren't corresponding circ records--some libraries
migrate data like this if the information available is sparse).
So if you want to be able to do this without a super user, you'll need to create
an ACTOR_USER_DELETE_OPEN_XACTS.override perm and assign it to perm groups
and/or users.
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Jason Etheridge [Wed, 11 Jan 2012 02:54:37 +0000 (21:54 -0500)]
whitespace
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Michael Peters [Wed, 12 Oct 2011 15:46:12 +0000 (11:46 -0400)]
LP872862, delete user function and open xacts
Prevent deletion of a user with open circulations or unpaid bills
Link up an error message on attempt to delete a patron with open xacts
Signed-off-by: Michael Peters <mrpeters@library.in.gov>
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Dan Wells [Thu, 19 Jan 2012 19:05:15 +0000 (14:05 -0500)]
Prevent extra closing tag in TPAC results list
Trivial change to prevent an extra yet currently harmless </tr>
closing tag from appearing when ChiliFresh is enabled.
Signed-off-by: Dan Wells <dbw2@calvin.edu>
Dan Scott [Mon, 9 Jan 2012 02:04:37 +0000 (21:04 -0500)]
TPAC: Regular justification of columns in search result
The search results page was constituted via a table, enclosing one table
per row for each result, enclosing one further table per result for the
attributes such as call number / publisher / edition that have been
chosen to be displayed in the simple and detailed views.
The column widths for each search result row were being calculated per
result, with the effect that title columns were starting at different
offsets - a rather unpolished effect.
By eliminating the middle table, we can let the widths be determined by
all of the search result rows together, providing a normalized result as
the HTML deities intended.
We also move some inline CSS into style.css.
Note that IE 7, at least, ignores the :nth-child() usage to deliver the
borders; because we no longer wrap the set of rows (including optional
Content Cafe and ChiliFresh rows) in an intermediate table, we had to
switch to a border-top attribute. We could have gone with a straight "tr
> td" approach, but that would have added a line at the top of the first
result, which looked weird. Still an option if one really wants to.
Signed-off-by: Dan Scott <dan@coffeecode.net>
Signed-off-by: Dan Wells <dbw2@calvin.edu>
Dan Scott [Sun, 8 Jan 2012 22:53:03 +0000 (17:53 -0500)]
TPAC: Simply record summary navigation markup
Currently we have the next / previous links on the far right side of the
record summary page, whereas the "Showing item # of #" is on the left
hand side of the page. On wide screens, this leads to a large gap
between the two informational elements. In addition, as the elements are
floated, the vertical alignment is thrown off if you attempt to bring
them together.
The solution is to group the elements inside a SPAN with inline-block
displays for the embedded DIVs. This enables the elements to reflow
appropriately on mobile sized screens while keeping the alignment clean.
In addition, some inline style gets moved to style.css and some
unnecessary elements are removed.
Signed-off-by: Dan Scott <dan@coffeecode.net>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Dan Scott [Sun, 8 Jan 2012 21:14:29 +0000 (16:14 -0500)]
TPAC: Improve copy display in record summary
In the copy counts, offer a link to display the copies at parent
libraries that have available copies. For example, if you are browsing
at BR1 and there are no available copies, but you see that SYS1 has
available copies, clicking "(Show)" beside the SYS1 available copy count
will change the search scope to SYS1 and display the copies for BR1 and
BR2.
Also, avoid displaying the copy table header if there are no physical
copies to display (for example, if there are located URIs that make the
copy show up in search results).
Signed-off-by: Dan Scott <dan@coffeecode.net>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Dan Scott [Mon, 9 Jan 2012 02:43:58 +0000 (21:43 -0500)]
Prevent expand and cnoffset params from propagating
The expand and cnoffset params in record summary might result in
unexpected behaviour if allowed to propagate by default, as mkurl()
enables, so stop them in their tracks.
Also, fix an overenthusiastic URI-encoding of subjects that led to a
space getting doubly-encoded (and thereby breaking searches).
Signed-off-by: Dan Scott <dan@coffeecode.net>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Dan Scott [Fri, 6 Jan 2012 03:51:00 +0000 (22:51 -0500)]
TPAC: Preserve loc, query, qtype, and sort params
In some cases, mkurl() is not enough to preserve our desired CGI params
- such as when redirects are triggered from within a Perl module, or
forms are submitted. Accordingly, the following changes address these
cases where the chosen location / query / query type was being dropped:
* Switching between account preferences
* Creating / deleting / sharing / editing bookbags
* Moving items from temporary list to bookbags
* Adding notes to items in a bookbag
* Placing holds
The primary mechanism for forms is the "preserve_params.tt2" block that
can accept a "params" list of the CGI params that you want to preserve,
but which defaults to location/query/qtype/sort. Similarly, we add the
same preservation steps to the OpenILS::WWW::EGCatLoader::Account module
for most actions.
Signed-off-by: Dan Scott <dan@coffeecode.net>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Dan Scott [Thu, 29 Dec 2011 05:11:25 +0000 (00:11 -0500)]
TPAC: Propagate CGI params via mkurl()
Fix many instances where params such as "loc" are dropped during a
normal workflow, resulting in unexpected changes to the user's chosen
search scope. mkurl() preserves the existing CGI params by default
and passes them on to the created URL; for now we err on the side of
caution (preserving all params) rather than filtering any out. Manual
testing suggests this does not introduce any problems, and resolves
many.
Signed-off-by: Dan Scott <dan@coffeecode.net>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Thomas Berezansky [Tue, 17 Jan 2012 16:13:15 +0000 (11:13 -0500)]
Don't show estimated wait for negative estimates
JSPac code was just checking for the truth of the estimated_wait return,
but the estimated_wait return can be -1 under some circumstances.
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Bill Erickson [Tue, 17 Jan 2012 16:53:03 +0000 (11:53 -0500)]
Repaired JS syntax errors in nls/selfcheck.js
Fixed errors introduced by
a727a91b26716a0df36c93c7962240bec231c180
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Thomas Berezansky [Sat, 14 Jan 2012 16:42:55 +0000 (11:42 -0500)]
TPac: Easy access to item status
Change item barcodes into item status links in TPac listings.
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Thomas Berezansky [Tue, 20 Sep 2011 14:27:51 +0000 (10:27 -0400)]
Allow choice of placing hold despite age protect
This alters the backend to watch when so much as one copy failed only due
to age protection. If so, a flag is set and returned back up the calling
tree for examination.
In JSPac when the flag is set an alternate confirm message is shown.
In TTPac when the flag is set the failure message is changed and override
is always allowed for the hold in question.
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
James Fournie [Fri, 9 Dec 2011 01:00:14 +0000 (17:00 -0800)]
P898427 Get holdings_xml.retrieve to flesh URIs properly
Flesh URIs when requested with the -uris or -full feed type.
This was broken when commit
f2b822f8 fixed authority browsing.
holdings_xml-full never appeared to retrieve URIs properly, so that has
been added.
This also makes holdings_xml-uris behave in the new manner of URIs as per
git commit
ba47ecc61, retrieving URIs for ancestors rather than descendants.
Signed-off-by: James Fournie <jfournie@sitka.bclibraries.ca>
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Thomas Berezansky [Wed, 11 Jan 2012 19:41:15 +0000 (14:41 -0500)]
Support auto-login in staff client
By adding three new command line parameters:
-ILSuser - Username to log in with
-ILSpassword - Password to use
-ILShost - hostname to use
If, and only if, all three are specified *and* we think we have an already
registered workstation for the hostname do we trigger an auto login.
Otherwise we just fill everything in and wait for the user.
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Lebbeous Fogle-Weekley [Wed, 11 Jan 2012 19:53:50 +0000 (14:53 -0500)]
Move csp definitions from 002 to 950, so they can use i18n.
I don't /think/ there's a point in having an upgrade script to go along
with this, but someone who understands oils_18n_gettext() better should
weigh in.
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Lebbeous Fogle-Weekley [Wed, 11 Jan 2012 15:37:29 +0000 (10:37 -0500)]
Merge remote branch 'working/collab/berick/invalidate_email_and_phone_revised'
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Bill Erickson [Wed, 11 Jan 2012 14:32:58 +0000 (09:32 -0500)]
Use org_depth for INVALID penalties
* Honor the org_depth setting on the penalties when applied
* Default to org_depth 0 (i.e. global) penalty application for invalid penalties
* Use the patrons' home_ou as the penalty org unit for patron reg invalidate actions.
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Lebbeous Fogle-Weekley [Tue, 27 Dec 2011 23:02:38 +0000 (18:02 -0500)]
Mark email addresses and phone numbers invalid
This comes from an idea from Jeff Godin. For staff to indicate an
email address or phone number "invalid," for whatever definition of
"invalid" has meaning at the institution (as in invalid addresses
today), there is now a UI control in the patron editor.
This UI control invokes a middle layer method that will clear the email
(or phone) field from actor.usr, and create a corresponding standing penalty
against the user, for staff to notice next time they bring up said patron in
the staff client. Such penalties will be archived whenever that patron's
email address or phone number is updated again.
The middle layer method is a wrapper around a method that may take
different parameters (like an email address instead of a patron ID) to
potentially support future uses such as invalidating email addresses
automatically in batch.
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Thomas Berezansky [Mon, 19 Dec 2011 20:55:52 +0000 (15:55 -0500)]
Receipt Template Non-String Protection
Don't try to replace on things that aren't strings.
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Jason Etheridge [Wed, 11 Jan 2012 04:48:58 +0000 (23:48 -0500)]
Relabel Force Context in receipt template editor
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Thomas Berezansky [Tue, 20 Dec 2011 16:49:16 +0000 (11:49 -0500)]
Add Context to Receipt Templates
By default the print context is used, but this enabled each template to be
assigned a specific printer context that it is intended for.
This means that things that normally use "Default" can be forced to, say,
"Receipt" and such easily.
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Thomas Berezansky [Mon, 19 Dec 2011 22:08:09 +0000 (17:08 -0500)]
Make Reprint Last printing context aware
Allows for re-use of previous printer context and all settings thereof.
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Jason Etheridge [Tue, 10 Jan 2012 16:55:20 +0000 (11:55 -0500)]
Remove 'boo' alert in hold details interface
Willing to let any surprises here be natural. :-) We can re-bug if there are
issues.
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Jason Etheridge [Tue, 10 Jan 2012 20:49:23 +0000 (15:49 -0500)]
fix breakage from recent merges
Also, a good argument for keeping all perm additions in the same INSERT in the
950 file, since git would have reported a merge conflict against master had I
done that instead of simply appending the upgrade script to the file.
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Mike Rylander [Tue, 10 Jan 2012 20:14:59 +0000 (15:14 -0500)]
Terminology adjustment to reduce conflicts with the term "recall"
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Mike Rylander [Tue, 10 Jan 2012 20:13:58 +0000 (15:13 -0500)]
Stamping force and recall hold permission addition script
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Thomas Berezansky [Thu, 6 Oct 2011 13:13:38 +0000 (09:13 -0400)]
Completing Force/Recall Holds
Add support for the Force and Recall hold types to be something other than
just aliases of Copy holds.
Both holds are made to cut in line over *all* other holds and both ignore
all hold rules, including copy, location, and status holdable flags.
Recall holds, when they reach their destination, will be flagged to be sent
to cataloging.
In addition, to place either kind of hold you need a new permission at the
copy's circulation library:
COPY_HOLD_FORCE for force holds
COPY_HOLD_RECALL for recall holds
Also, some re-ordering of logic should result in a fix for issues with
capturing holds as transits and/or suppressing holds and the hold shelf
logic.
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Mike Rylander [Tue, 10 Jan 2012 20:11:07 +0000 (15:11 -0500)]
Merge branch 'master' of git.evergreen-ils.org:Evergreen
Mike Rylander [Tue, 10 Jan 2012 20:03:57 +0000 (15:03 -0500)]
Stamping upgrade script for in-db hold permit fixups
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Dan Scott [Tue, 10 Jan 2012 19:53:06 +0000 (14:53 -0500)]
Add customization to staff client serial and print CSS files
The *_custom.css variants of these are created automatically at install
time, so give the parents the ability to actually use them.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Thomas Berezansky [Thu, 6 Oct 2011 18:23:26 +0000 (14:23 -0400)]
TPac messages for item/location/status not holdable
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Thomas Berezansky [Thu, 6 Oct 2011 15:48:21 +0000 (11:48 -0400)]
Fix INDB hold permit holdable checking
Check Item/Status/Location holdable flags
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Lebbeous Fogle-Weekley [Tue, 10 Jan 2012 17:59:57 +0000 (12:59 -0500)]
Add a "staff_alert" column to config.standing_penalty, and ...
... consult this when deciding whether to show the stop sign page in the
patron interface of the staff client, rather than explicitly checking
for the id of the ALERT_NOTE config.standing_penalty.
Now only show the standing penalty if the staff_alert value is true,
instead of unconditionally showing it for all penalties with a
block_list value. This allows staff to configure blocking penalties
that do not alert.
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Mike Rylander [Tue, 10 Jan 2012 19:26:50 +0000 (14:26 -0500)]
Merge remote-tracking branch 'eg-working/user/senator/tpac-bookbag-viewer'
Lebbeous Fogle-Weekley [Tue, 15 Nov 2011 06:50:00 +0000 (01:50 -0500)]
Tpac: better "HTML view" for shared lists under "my lists"
From the "my lists" interface, you get a link labeled "HTML View" for
any shared lists, and this link, while meant to be shared, just
gives you a search results page where the only search term is simply "in
the given list."
This commit makes the search results page a little smarter in that case,
in order to
a) show you the bookbag metadata, including name, description and
item notes.
b) allow you to keep searching *within* your list, until you don't
want to anymore, at which point there's a checkbox you can uncheck.
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Mike Rylander [Tue, 10 Jan 2012 19:14:38 +0000 (14:14 -0500)]
Stamping upgrade script for SMS notification branch
Signed-off-by: Mike Rylander <mrylander@gmail.com>