Thomas Berezansky [Tue, 3 Apr 2012 18:45:10 +0000 (14:45 -0400)]
Fix some "null" instead of blank values in JSPac
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Michael Peters <mrpeters@library.in.gov>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Dan Scott [Tue, 1 May 2012 05:52:56 +0000 (01:52 -0400)]
Release notes: clean up and introduce TPAC
General clean-up of the release notes for consistency and to support
PDF output:
* Reformat line-widths to 80 characters or less
* Mark interface window and element names as bold
* Fix up some formatting glitches and headers
* Make the "Documentation is available..." note standard & separated
by one line; I suspect we will want to modify this globally, so it
will be easier if it is consistent.
Also, give a brief introduction to the TPAC and mention the forthcoming
JSPAC deprecation in the next feature release.
Signed-off-by: Dan Scott <dan@coffeecode.net>
Kathy Lussier [Tue, 1 May 2012 05:26:28 +0000 (01:26 -0400)]
LP992377: More 2.2 release notes from Kathy Lussier
Kathy Lussier <klussier@masslnc.org> contributed significant additions
to the 2.2 release notes in https://bugs.launchpad.net/bugs/992377 -
thanks Kathy!
Signed-off-by: Dan Scott <dan@coffeecode.net>
Galen Charlton [Mon, 30 Apr 2012 11:22:01 +0000 (07:22 -0400)]
additions to release notes for 2.2
Written by Sally Fortin <sfortin@esilibrary.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Bill Erickson [Wed, 21 Mar 2012 20:33:39 +0000 (16:33 -0400)]
Vandelay match set permission additions
Allow retrieve access for match points with the VIEW_IMPORT_MATCH_SET
permission (in addition to ADMIN_IMPORT_MATCH_SET).
Adds 2 new permissions to the database:
ADMIN_IMPORT_MATCH_SET
VIEW_IMPORT_MATCH_SET
From Jason Stephenson resolving conflicts:
> Conflicts:
>
> Open-ILS/src/sql/Pg/950.data.seed-values.sql
>
> I had to change the ids of the new permissions because another branch
> had used one of the ids since this branch was last rebased. I also edited
> the ids in the upgrade script to match what is in 950.data.seed-values.sql.
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Jason Stephenson <jstephenson@mvlc.org>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Dan Scott [Sat, 28 Apr 2012 19:52:54 +0000 (15:52 -0400)]
Update POT files for translators
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Sat, 28 Apr 2012 18:12:43 +0000 (14:12 -0400)]
Update translations from Launchpad
Includes a small update to the update_pofiles to make it easier for
release managers and release maintainers to run translation updates.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Lebbeous Fogle-Weekley [Thu, 5 Apr 2012 15:46:05 +0000 (11:46 -0400)]
Constrain serial.issuance.holding_code to be valid JSON or NULL
This avoids serial.materialize_holding_code() failing on bad data. The
upgrade script will actually throw away bad values for
serial.issuance.holding_code. This is no real loss, since bad data
there prevents any serials functions around the row in question from
working properly anyway.
This problem was reported by Martha Driscoll and Ben Shum.
*Also* put a couple of changes missed from the 0700 upgrade script into
210.schema.serials.sql.
Fix new serial constraint upgrades
1. None of the upgrades so far have moved is_json() from the public
to the evergreen schema. That's probably a separate issue, but it
should be safe to call it unqualified, and that's what the rest of
the upgrade file does, so we will too.
2. Add a specific SET CONSTRAINT to avoid deferred trigger problems
when ALTERing the table.
3. Make sure that the unwanted columns on materialized_holding_code
do not exist regardless of your upgrade path.
Signed-off-by: Dan Wells <dbw2@calvin.edu>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Michael Peters [Fri, 9 Mar 2012 19:20:09 +0000 (14:20 -0500)]
Remove the "print_nav.tt2" from the TTPAC Password Reset
We no longer use "print_nav.tt2" in TTPAC, but it was still
displaying on the password reset page. This branch removes it.
Signed-off-by: Michael Peters <mrpeters@library.in.gov>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Bill Erickson [Thu, 12 Apr 2012 19:34:02 +0000 (15:34 -0400)]
Add missing ADMIN_ORG_UNIT_CUSTOM_TREE permission
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Michael Peters <mrpeters@library.in.gov>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Dan Scott [Fri, 27 Apr 2012 01:56:23 +0000 (21:56 -0400)]
TPAC: Instrument the search results page
Because we want to know why search results can be slowish, add timelog()
entries to pertinent locations in Search.pm.
Quick results on my laptop with the concerto set:
* 10 results = 1.1 seconds for get_records_and_facets()
* 50 results = 4.2 seconds for get_records_and_facets()
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Galen Charlton [Sat, 28 Apr 2012 14:27:19 +0000 (10:27 -0400)]
tweak wording - ChangeLogs are generated during release
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Bradley M. Kuhn [Sat, 28 Apr 2012 14:03:09 +0000 (10:03 -0400)]
ChangeLog shouldn't merely be empty; it should tell reader where to find a change log.
Signed-off-by: Bradley M. Kuhn <bkuhn@ebb.org>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Bradley M. Kuhn [Sat, 28 Apr 2012 03:36:19 +0000 (23:36 -0400)]
autoreconf -f -i appears to clobber our own INSTALL file with the "standard" one.
autoreconf -i seems to still work correctly for building Evergreen, therefore,
we should recommend developers do that.
Signed-off-by: Bradley M. Kuhn <bkuhn@ebb.org>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Bradley M. Kuhn [Sat, 28 Apr 2012 02:08:38 +0000 (22:08 -0400)]
AUTHORS, NEWS, and INSTALL files should actually have reasonable content if they exist.
Specifically, this commit:
* simply points INSTALL to README via symlink, since install instructions are there.
* AUTHORS now notes that Evergreen keeps its authors in the git log.
* NEWS now explains where release notes are.
Signed-off-by: Bradley M. Kuhn <bkuhn@ebb.org>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Ben Shum [Wed, 25 Apr 2012 03:23:04 +0000 (23:23 -0400)]
Do not hide copy counts from results in staff client.
Remove the check for whether you are a staff login or not.
Ideally, we would want the copy counts to be displayed in both
public catalog and staff client.
Signed-off-by: Ben Shum <bshum@biblio.org>
Signed-off-by: Olli-Antti Kivilahti <olli-antti.kivilahti@jns.fi>
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Lebbeous Fogle-Weekley [Wed, 25 Apr 2012 20:19:45 +0000 (16:19 -0400)]
Apply timelog() to TPAC record detail page
Early suggestion from results is that we either need to use unapi.bre more
smartly, or optimize it further.
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Wed, 25 Apr 2012 19:20:46 +0000 (15:20 -0400)]
Instrument the TPAC: add timelog() method to EGCatLoader
Meant for timing how long events take to generate a single TPAC page,
the timelog() method will provide timing in microsecond granularity of
various events required to build the page.
To invoke: $self->timelog("Event description...");
Builds up a context variable named "timing" containing a list of
arrays; each array entry contains a time and the event description.
Disabled by default; to enable, set DEBUG_TIMING = 1 in
OpenILS/WWW/EGCatLoader.pm
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Lebbeous Fogle-Weekley [Wed, 25 Apr 2012 20:24:04 +0000 (16:24 -0400)]
Merge remote branch 'working/user/dbwells/serial_items_and_note_fixes'
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Jason Etheridge [Fri, 30 Mar 2012 19:32:53 +0000 (15:32 -0400)]
unsaved data loophole
The Start/Previous/Next/End/Search Results buttons in the staff client OPAC
wrapper do not fire unsaved data warnings for the MARC editor when changing
records. This plugs that hole, but it's not a complete solution, as you can
still move away from the record by clicking on hyperlinks in the OPAC View,
though that's less likely to happen.
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Signed-off-by: Michael Peters <mrpeters@library.in.gov>
Dan Scott [Sun, 22 Apr 2012 19:40:00 +0000 (15:40 -0400)]
Bootstrap via "autoreconf -f -i" instead of "autogen.sh"
It has always been potentially confusing to maintain two shell scripts
named "autogen.sh" for two distinct purposes in Evergreen. Take
advantage of "autoreconf" that is packaged with autoconf for dev
bootstrapping purposes and trash the old "autogen.sh" as a result.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Signed-off-by: Jason Stephenson <jstephenson@mvlc.org>
Dan Wells [Tue, 17 Apr 2012 20:48:43 +0000 (16:48 -0400)]
Clean up and refine serial note support, part 3
Add needed menu entries for invoking the serial notes editor from
the list in the Items tab.
Signed-off-by: Dan Wells <dbw2@calvin.edu>
Dan Wells [Tue, 17 Apr 2012 21:35:26 +0000 (17:35 -0400)]
Clean up and refine serial note support, part 2
Because of the way our notes are being rendered, a handful of
special XML characters can break the note interface when editing.
These characters are now properly encoded as entities.
Also, editing of newlines presents a similar issue with different
consequences, and it is handled similarly but separately.
Signed-off-by: Dan Wells <dbw2@calvin.edu>
Dan Wells [Tue, 17 Apr 2012 21:34:06 +0000 (17:34 -0400)]
Clean up and refine serial note support, part 1
This commit fixes a number of minor problems with serial notes:
1) Serial notes are currently returned in "random" (database)
order. Adding a create_date sort is a sensible default.
2) If you have many notes, they start to display in a squashed and
unreadable fashion. Switching from a groupbox to a styled vbox
provides a simple workaround.
3) It is currently impossible to display newlines in notes. We can
deal with this by changing the display style.
Signed-off-by: Dan Wells <dbw2@calvin.edu>
Dan Wells [Tue, 17 Apr 2012 20:02:49 +0000 (16:02 -0400)]
Limit excess serial data fetching
Overfetching and duplication of data in the interface is both
inefficient and bug-inducing. This reduces a couple big offenders.
First, in the items tab, we will store distribution and subscription
data separately, rather than duplicating for every row. Second, we
will only redraw rows as needed rather than refresh the whole list so
often. Finally, we no longer need to lookup call numbers separately,
as they are included in the one-time distribution fetch.
Signed-off-by: Dan Wells <dbw2@calvin.edu>
Dan Wells [Fri, 13 Apr 2012 13:53:32 +0000 (09:53 -0400)]
Better Prediction for Incomplete Chronologies
While relatively rare, some journals record only the year on the
cover, even if they come out monthly or weekly. This commit
expands our previous support for serials with no chronology at
all to cover serials with partial chronology.
Signed-off-by: Dan Wells <dbw2@calvin.edu>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Lebbeous Fogle-Weekley [Fri, 13 Apr 2012 21:18:58 +0000 (17:18 -0400)]
Acq: Refactor General Search for more smarts and speed
This started in response to problems discussed around
https://bugs.launchpad.net/evergreen/+bug/967824 , but it really
addresses a distinct issue from that bug.
Acq General Search relies on lots of joins to make several tables in Acq
searchable by attributes of any of the other tables for rows that happen
to be related. This is about 1) making better joins and 2) making fewer
joins when you don't need them all for a given search.
Much thanks to Mike Rylander for help figuring out how to efficiently
implement the joins needed for acq.invoice, which is the tricky part.
Less importantly, but still significant for some searches, we also need
case insensitivity for searching on user-linked fields (General Search
always lets you search by any of username/family name/given name/barcode
for these fields) in order to take advantage of some indexes for speed.
This diagram of key Acq relationships is helpful:
https://docs.google.com/drawings/d/15ExkiYvq0skfobbocvPWxwdZkb7aykEZpLGfbP9PL04/view
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Signed-off-by: Ben Shum <bshum@biblio.org>
Thomas Berezansky [Fri, 13 Apr 2012 14:07:17 +0000 (10:07 -0400)]
More patron display css tweaks
To help prevent some "jumpy" interfaces due to borders and text appearing
and disappearing with selections and updates.
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Jason Etheridge [Fri, 13 Apr 2012 06:54:13 +0000 (02:54 -0400)]
add more penalty related CSS hooks
PATRON_HAS_CUSTOM_PENALTY (if the penalty is not a stock penalty, based on id)
PATRON_HAS_STAFF_ALERT (if the staff_alert boolean on the penalty is true)
PATRON_HAS_BLOCK (if there's anything in the penalty's block list)
PATRON_HAS_CIRC_BLOCK (if CIRC is in the block list)
PATRON_HAS_RENEW_BLOCK (if RENEW is in the block list)
PATRON_HAS_HOLD_BLOCK (if HOLD is in the block list)
PATRON_HAS_CAPTURE_BLOCK (if CAPTURE is in the block list)
PATRON_HAS_FULFILL_BLOCK (if FULFILL is in the block list)
also adds stock CSS for PATRON_HAS_STAFF_ALERT, a blue border around the patron
name.
In the color hierarchy, this comes after the normal Green/Lime status, but gets
trumped by any other penalty that sets a colored border.
So, for example, if a patron has no penalties, and you go to Messages and add an
"Alert" note, that equates to the penalty ALERT_NOTE, which has a staff_alert
setting of True. On a refresh, the patron will then have a blue border around
their name. If you then create a bill on that patron for $100, triggering the
PATRON_EXCEEDS_FINES penalty, then the patron will gain the normal purple or
lavender border, even though the penalty also has a staff_alert setting of True
and triggers PATRON_HAS_STAFF_ALERT CSS.
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Galen Charlton [Thu, 12 Apr 2012 21:19:40 +0000 (17:19 -0400)]
lp#980303: don't complain about missing plperl
Now that use of PL/PERL has been dropped in favor of
using PL/PERLU for all Perl SPs, settings-tester.pl need not
check for it.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Dan Scott <dan.scott@laurentian.ca>
Dan Scott [Wed, 11 Apr 2012 04:08:41 +0000 (00:08 -0400)]
TPAC: Clear params when viewing lists in search results
Per LP977353, search terms are propagating when the list is being viewed
in "results" (HTML View), and therefore those search terms block the
display of most or all of the items in the list. Therefore, do not
propagate the other CGI params to the mkurl() call.
Signed-off-by: Dan Scott <dan@coffeecode.net>
Signed-off-by: Jason Stephenson <jstephenson@mvlc.org>
Dan Scott [Fri, 6 Apr 2012 18:52:20 +0000 (14:52 -0400)]
Add pref_ou query filter for preferred library searching
Include the user's "preferred search library" (as set in search
preferences, falling back to home OU) in searches, specifically for the
purposes of ensuring that located URIs at the user's preferred library
would trigger hits where physical copies would be out of scope.
Practical example:
1. User sets preferred search library to BR1.
2. They jump onto the catalogue, log in (which changes their search org
to their preferred search library of BR1), but then for some reason
change their search org in the org selector to BR3.
3. They issue a search for "Harry Potter and the Philosopher's Stone".
BR3 doesn't hold any copies or have any located URIs, but SYS1 (BR1's
parent) has a PotterMore licence and has added their 856 $9 SYS1 to a
bib record.
As it currently stands, User is out of luck; they won't see any hits in
search results as there are no copies or located URIs in the BR3 scope.
The proposed enhancement would, however, make the search results contain
a hit for "Harry Potter and the Philosopher's Stone" at the user's
preferred search library.
Sites can trigger the preferred library as part of the query filters
using the "pref_ou(SHORTNAME)" syntax.
Signed-off-by: Dan Scott <dan@coffeecode.net>
Signed-off-by: Jason Stephenson <jstephenson@mvlc.org>
Thomas Berezansky [Wed, 11 Apr 2012 18:58:26 +0000 (14:58 -0400)]
Nicer staff searches display in record details
Specifically, don't make us scroll down a few hundred pixels to see the
actual page content.
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Dan Scott <dan@coffeecode.net>
Jason Etheridge [Tue, 10 Apr 2012 17:15:09 +0000 (13:15 -0400)]
fix sort bug introduced with multi-sort
The bug happens on columns without a defined sort_value
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Jason Etheridge [Tue, 10 Apr 2012 16:57:16 +0000 (12:57 -0400)]
Fix bill selection in the billing interface
We were looking for the checkbox column to be the first treecell in a treerow,
but the ever-present line number column now takes up that position.
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Signed-off-by: Ben Shum <bshum@biblio.org>
Thomas Berezansky [Mon, 9 Apr 2012 20:22:06 +0000 (16:22 -0400)]
Bump 2.2 beta version number in upgrade script
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Dan Scott [Mon, 9 Apr 2012 13:37:57 +0000 (09:37 -0400)]
i18n: Robustify db-seed-i18n.py parsing
Faced with the perplexing use of a space before a comma in
oils_i18n_gettext() keys, db-seed-i18n.py's regex failed. The solution
for a sloppy regex? More powerful regex!
Signed-off-by: Dan Scott <dan@coffeecode.net>
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Dan Scott [Tue, 27 Mar 2012 04:12:43 +0000 (00:12 -0400)]
TPAC: Integrate i18n for TPAC into build process
Support the "standard" i18n build process for internationalization by
integrating the TPAC string extraction (via xgettext.pl) and update /
install bits. Also, add the base POT file to support translation in
Launchpad.
Signed-off-by: Dan Scott <dan@coffeecode.net>
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Dan Scott [Sun, 8 Apr 2012 22:13:26 +0000 (18:13 -0400)]
TPAC: Protect against requests for non-existent records
If a record request is received for a record that does not exist (say,
if 100 records have been loaded and someone submits a request for
/eg/opac/record/399), rather than dying with a server error, return
immediately.
Eventually we'll want to provide an explicit "record was not
found error" in the TPAC record details; for now the TPAC just displays
zero bib detail.
Signed-off-by: Dan Scott <dan@coffeecode.net>
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Mike Rylander [Wed, 29 Feb 2012 17:04:54 +0000 (12:04 -0500)]
Protect against empty default_CD_modifiers in opensrf.xml
If the app settings for the open-ils.search service in opensrf.xml had
an empty (but not entirely missing) <default_CD_modifiers> element, then
the open-ils.storage log would contain entries like the following:
Use of uninitialized value $class in hash element at
/usr/local/share/perl5/OpenILS/Application/Storage/QueryParser.pm
Protect against that problem with more defensive code in QueryParser.pm.
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Signed-off-by: Dan Scott <dan@coffeecode.net>
Lebbeous Fogle-Weekley [Mon, 9 Apr 2012 15:27:53 +0000 (11:27 -0400)]
Avoid too-strict controller checks when fleshing for cstore, reporter-store
Move controller-verificiation from the beginning of recursive
doFieldmapperSearch() to nearer the end, right before we recurse, so we
only check the child class's controller if we're pcrud. If we're not
pcrud, code that calls doFieldmapperSearch() from the outside will have
already done appropriate testing of the controller.
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Bill Erickson [Tue, 3 Apr 2012 18:39:00 +0000 (14:39 -0400)]
Org Unit Custom Tree supports add directly after delete
When deleting a node from the custom tree, it's necessary to save the
tree store after the final call to store.deleteItem, or the delete
operation will not complete. Without this, it's not possible to add a
remove org unit back into the custom tree without reloading the UI.
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Bill Erickson [Tue, 3 Apr 2012 19:14:35 +0000 (15:14 -0400)]
Org unit custom tree sort repairs
Repairs a problem with detecting and storing the sort order of sibling
nodes within custom trees. The original problem was the result of
comparing parent nodes for non-siblings because of a depth-first tree
traversal. Now we process siblings in level-order before processing
child nodes.
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Dan Scott [Mon, 9 Apr 2012 12:59:55 +0000 (08:59 -0400)]
Bug 957453: Fix error in database seed data
The use of an explicit ID in creating a new
action_trigger.event_definition row was followed by the use of the
CURRVAL() function to grab the most recently issued value for
the action_trigger.event_defintion_id_seq sequence - which happened to
be 100, due to a previously issued SETVAL() on the sequence.
This resulted in references to non-existent event definitions and thus
an error in creating the stock database schema.
By using an explicit ID for the dependent row, we avoid this error.
Signed-off-by: Dan Scott <dan@coffeecode.net>
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Dan Scott [Mon, 9 Apr 2012 13:14:16 +0000 (09:14 -0400)]
README: Clarify PostgreSQL 9.1 vs. 9.0 remote server docs
Break out the PostgreSQL 9.1 or later instructions into their own
subsection to clarify how the steps differ from PostgreSQL 9.0.
Signed-off-by: Dan Scott <dan@coffeecode.net>
Dan Scott [Sun, 8 Apr 2012 19:47:10 +0000 (15:47 -0400)]
TPAC: Show deleted record warning for deleted records
At the cost of an extra database query per record displayed, we can
properly activate the "This record has been deleted..." message. Prior
to this commit, the message was embedded on every page but hidden via
CSS - which isn't great for search engines or source-reading types.
Now we only include & display the message if it has, in fact, been
deleted.
Signed-off-by: Dan Scott <dan@coffeecode.net>
Signed-off-by: Ben Shum <bshum@biblio.org>
Thomas Berezansky [Mon, 9 Apr 2012 01:32:25 +0000 (21:32 -0400)]
Stamp tpac value maps upgrade script
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Thomas Berezansky [Thu, 5 Apr 2012 19:39:40 +0000 (15:39 -0400)]
Add "Simple" flag for selectors
This causes JSPac to ignore them and TPac to sort them above a divider.
Also fixes an issue where excessive escaping was being done on values. This
would break some values in the value map selectors.
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Ben Shum <bshum@biblio.org>
Thomas Berezansky [Thu, 29 Mar 2012 20:39:10 +0000 (16:39 -0400)]
Add i18n tag to coded value map value/description
Because the seed data assumes they are translated, so tell the IDL.
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Ben Shum <bshum@biblio.org>
Thomas Berezansky [Thu, 29 Mar 2012 19:37:07 +0000 (15:37 -0400)]
Coded Value Maps Opac Visible/Search Labels
Add two new fields to Coded Value Maps:
1 - Opac Visible, for "does this show up in opac limiter boxes"
2 - Search Label, for "what does this get called for those boxes"
Intended use cases include:
Re-labeling MARC fields without changing the base MARC information, say
because you don't expect patrons to understand "Projected Medium".
Hiding things that don't apply, say the vast majority of language limiters,
without needing to delete rows.
I also hooked it up in JSPac, because it was easy to do so.
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Ben Shum <bshum@biblio.org>
Joseph Lewis [Tue, 3 Apr 2012 16:13:20 +0000 (10:13 -0600)]
Fixed a slight misspelling, as noted in https://bugs.launchpad.net/evergreen/+bug/915564
Signed-off-by: Joseph Lewis <joehms22@gmail.com>
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Lebbeous Fogle-Weekley [Tue, 3 Apr 2012 16:53:04 +0000 (12:53 -0400)]
Merge branch 'master' of git://git.evergreen-ils.org/Evergreen
Lebbeous Fogle-Weekley [Tue, 3 Apr 2012 16:49:28 +0000 (12:49 -0400)]
Merge remote branch 'working/user/dbwells/shared_siss_editor'
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Lebbeous Fogle-Weekley [Tue, 3 Apr 2012 15:16:16 +0000 (11:16 -0400)]
Fix failure of 'My Selection Lists' interface
Addresses this bug: https://bugs.launchpad.net/evergreen/+bug/967824
Recent changes to the mechanism of unified search (for which 'My
Selection Lists' is a frontend) lacked code that respected
the new join structure for some use cases.
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Lebbeous Fogle-Weekley [Tue, 3 Apr 2012 16:20:50 +0000 (12:20 -0400)]
Revert "Serial Control: Use Dijit-based issuance editor"
This reverts commit
37b324f53adb4fb90fe17ada72d44fca1d606e9f.
This commit was regrettably merged without other commits from its
branch on which it depends.
Dan Scott [Tue, 3 Apr 2012 13:33:24 +0000 (09:33 -0400)]
Remove located URI scope notes from 2.2 Release Notes
The located URI scope change occurred in the 2.1 time frame, not in 2.2,
so remove from the Release Notes.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Bill Erickson [Mon, 2 Apr 2012 21:15:25 +0000 (17:15 -0400)]
Add ui.hide_copy_editor_fields to baseline seed data
Without it, the "Hide Fields" option in the copy editor will not
function.
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Thomas Berezansky [Mon, 2 Apr 2012 15:52:12 +0000 (11:52 -0400)]
Update 2.1-2.2 version upgrade script for beta1
Including missing chunks and missing commas.
Moved 0693 to the end, it may exist in some 2.1 installs.
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Mike Rylander [Mon, 2 Apr 2012 17:41:00 +0000 (13:41 -0400)]
Stamping upgrade script for "Org unit selective hiding and sorting in tpac library selector"
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Bill Erickson [Fri, 30 Mar 2012 13:38:56 +0000 (09:38 -0400)]
Custom Org Tree : Admin UI honors "activate" on new trees
Previously, activating a new tree would work, but the UI did not update
to reflect it. Now the activate link correctly turns into a de-activate
link and vice versa.
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Bill Erickson [Wed, 21 Mar 2012 18:34:19 +0000 (14:34 -0400)]
TPac: non-inherited org unit visibility : hide copy counts
Avoid showing copy counts for non-opac-visible org units in the search
results and record details page. This is important when the
'opac.org_unit.non_inheritied_visibility' global flag is enabled, as org
units along the tree may be non-visible.
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Bill Erickson [Tue, 20 Mar 2012 19:16:09 +0000 (15:16 -0400)]
Custom Org Tree : Admin UI
New UI for managing custom org unit trees. (Only OPAC is supported for
now). Custom trees default to the same shape as the full org unit tree.
Staff can remove nodes and re-order nodes. Staff can also replace
deleted nodes by dragging them from the reference tree on the left.
Admin -> Server Admin -> Custom Org Unit Trees
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Bill Erickson [Mon, 19 Mar 2012 20:31:08 +0000 (16:31 -0400)]
Custom Org Tree : tpac
If configured and active, the tpac will now use the custom 'opac' tree
for the org unit selectors. This will be true in both the public
catalog and the staff client catalog. The staff client catalog will
continue to display hidden org units.
If the opac.org_unit.non_inheritied_visibility global flag is set, the
public catalog will display child nodes of hidden org units in the
custom tree.
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Bill Erickson [Mon, 19 Mar 2012 20:30:52 +0000 (16:30 -0400)]
Custom Org Tree : DB and IDL
Support for building custom org unit hierarchies for display purposes.
Initially, this is meant to support custom OPAC trees, but the design
leaves from for other types of trees.
The only restrictions to custom org trees is that no org unit appear
more once and that they in fact be tree-shaped. Otherwise, any node
can be the parent/child of any other node, regardless of ou_type, etc.
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Bill Erickson [Tue, 13 Mar 2012 16:15:33 +0000 (12:15 -0400)]
Repaired non-slim org unit fetching bug
Fixed an old thinko. When fetching a full org unit object, set the
children org unit array value instead of clobbering the function.
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Bill Erickson [Mon, 12 Mar 2012 16:22:22 +0000 (12:22 -0400)]
TPac: non-inherited org unit visibility
Adds support for displaying org units that are children of hidden org
units in the tpac org unit selector. A new global flag was added to
control this behavior called "opac.org_unit.non_inheritied_visibility" /
"Org Units Do Not Inherit Visibility".
To avoid confusion / distorted org unit trees, children of hidden org
units are left-padded one less for each hidden parent org unit. For
example, in the stock org tree, if Sys2 is opac_visible=false (and the
global flag is enabled), the tree in the tpac would appear like so:
Cons
- Sys 1
-- BR1
--- SL1
-- BR2
- BR3
- BR4
Similarly, if CONS was also hidden, the whole tree would be shifted left
by 1 pad depth.
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Bill Erickson [Mon, 2 Apr 2012 17:25:54 +0000 (13:25 -0400)]
Merge branch 'revert-lp954310'
Reverting commits from LP 954310, since the wrong branch was merged.
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Bill Erickson [Mon, 2 Apr 2012 17:18:19 +0000 (13:18 -0400)]
Revert "TPac: non-inherited org unit visibility"
This reverts commit
1b7c563166d60ddee4a9c507f3eded07bc5e70c0.
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Bill Erickson [Mon, 2 Apr 2012 17:18:18 +0000 (13:18 -0400)]
Revert "Org unit sibling display sort order"
This reverts commit
dee33cc9da90762dea9b9aa13190c65e80f07577.
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Bill Erickson [Mon, 2 Apr 2012 17:18:17 +0000 (13:18 -0400)]
Revert "Repaired non-slim org unit fetching bug"
This reverts commit
706f1e86f0b9e4b5423b1b355bd30db422316068.
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Bill Erickson [Mon, 2 Apr 2012 17:18:15 +0000 (13:18 -0400)]
Revert "Org unit sibling display sort order : admin UI"
This reverts commit
1108cfc0b3978dc0fd80566a2b654edcf6b99d55.
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Bill Erickson [Mon, 2 Apr 2012 17:18:01 +0000 (13:18 -0400)]
Revert "Stamping upgrade script for "Org unit selective hiding and sorting in tpac library selector""
This reverts commit
a25aa4e66ce4080bac65cd702a1e51542d5bae7e.
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Jason Etheridge [Mon, 2 Apr 2012 16:23:59 +0000 (12:23 -0400)]
remove some cruft
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Signed-off-by: Jason Stephenson <jstephenson@mvlc.org>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Jason Etheridge [Fri, 30 Mar 2012 17:06:44 +0000 (13:06 -0400)]
add context menu to xul list column headers
for multi-sort options. Also fix ascending vs descending internally (since the
distinction is now exposed via labels)
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Signed-off-by: Jason Stephenson <jstephenson@mvlc.org>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Jason Etheridge [Thu, 29 Mar 2012 15:11:55 +0000 (11:11 -0400)]
xul list secondary sorting
For xul-based lists in the staff client (interfaces with a grey background),
normal behavior is to sort the list when you left click a column header.
This is still the case, but now if you control+click a column header, it sets
up that column as a secondary sub-sort. Control+clicking more columns will
set up subsequent sub-sorts.
Normal click a column header for primary sorting will clear out all previously
defined sub-sorts. Control+clicking when a primary column has not yet been
normal clicked effectively does nothing.
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Signed-off-by: Jason Stephenson <jstephenson@mvlc.org>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Jason Etheridge [Thu, 29 Mar 2012 15:49:51 +0000 (11:49 -0400)]
mitigate race conditions with ordinal line number column
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Signed-off-by: Jason Stephenson <jstephenson@mvlc.org>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
James Fournie [Thu, 1 Mar 2012 00:42:10 +0000 (16:42 -0800)]
Acq - fix cloning of picklists so that all lineitems are cloned with a 'new' state
This prevents duplicated items on purchase orders when the picklists are cloned and
other wacky problems.
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Mike Rylander [Mon, 2 Apr 2012 16:17:51 +0000 (12:17 -0400)]
Stamping upgrade script for "Org unit selective hiding and sorting in tpac library selector"
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Bill Erickson [Tue, 13 Mar 2012 16:17:23 +0000 (12:17 -0400)]
Org unit sibling display sort order : admin UI
Adds a new menu entry for Local Admin called "Library Sort Order", where
staff can configure via drag-n-drop the sibling display order for org
units in the opac.
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Bill Erickson [Tue, 13 Mar 2012 16:15:33 +0000 (12:15 -0400)]
Repaired non-slim org unit fetching bug
Fixed an old thinko. When fetching a full org unit object, set the
children org unit array value instead of clobbering the function.
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Bill Erickson [Mon, 12 Mar 2012 18:11:47 +0000 (14:11 -0400)]
Org unit sibling display sort order
Adds a new "sibling_order" column to actor.org_unit which specifies the
order in which an org unit should be sorted as compared to its sibling
org units in org unit trees.
This commit adds the IDL/DB components. It also updates the tpac and
the generic get_org_tree API. (Note, a follow-up commit will be pushed
to remove some deprecated / reduntant org tree retrievals).
Note that the sibling_order values do not have to be unique within each
set of siblings. The org unit name is still used as a tie-breaker sort,
so if the sort order is left unset (i.e. all values are 0), org units
will fall back to name-only sorting.
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Bill Erickson [Mon, 12 Mar 2012 16:22:22 +0000 (12:22 -0400)]
TPac: non-inherited org unit visibility
Adds support for displaying org units that are children of hidden org
units in the tpac org unit selector. A new global flag was added to
control this behavior called "opac.org_unit.non_inheritied_visibility" /
"Org Units Do Not Inherit Visibility".
To avoid confusion / distorted org unit trees, children of hidden org
units are left-padded one less for each hidden parent org unit. For
example, in the stock org tree, if Sys2 is opac_visible=false (and the
global flag is enabled), the tree in the tpac would appear like so:
Cons
- Sys 1
-- BR1
--- SL1
-- BR2
- BR3
- BR4
Similarly, if CONS was also hidden, the whole tree would be shifted left
by 1 pad depth.
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Dan Wells [Mon, 26 Mar 2012 20:28:04 +0000 (16:28 -0400)]
Serial Control: Use Dijit-based issuance editor
The serial control interfaces use editors derived from the XUL
copy editor, while the alternate control uses Dijit editors. This
commit takes a small step toward unification by using the Dijit
issuance editor within the serial control interface, with the
following benefits:
1) Both controls will have a very similar editor look and feel
2) Takes advantage of custom holding code wizard widget
3) Future fixes and enhancements to the editors will apply easily
to both controls
4) Begin deprecating XUL serial editors
This commit doesn't yet rip out the old issuance editor code, as
that should wait until the transition is more complete.
Signed-off-by: Dan Wells <dbw2@calvin.edu>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Thomas Berezansky [Mon, 2 Apr 2012 15:37:10 +0000 (11:37 -0400)]
Stamping Stat Cat Enhancements upgrade script
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Scott Prater [Tue, 28 Feb 2012 19:43:00 +0000 (13:43 -0600)]
Patron Stat Cat Enhancements: SQL upgrade statements
Add SQL upgrade statements: new table stat_cat_entry_default,
new columns 'required' and 'allow_freetext' on actor.stat_cat,
and new permissions to create, delete default entries.
Signed-off-by: Scott Prater <sprater@gmail.com>
Signed-off-by: Ben Shum <bshum@biblio.org>
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Scott Prater [Thu, 22 Mar 2012 02:44:23 +0000 (21:44 -0500)]
Patron Stat Cat Enhancements: Only show default entry for new patrons
Only display the default entry when registering new patrons.
Otherwise, display the saved value for the patron or nothing.
Signed-off-by: Scott Prater <sprater@gmail.com>
Signed-off-by: Ben Shum <bshum@biblio.org>
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Scott Prater [Tue, 28 Feb 2012 16:22:29 +0000 (10:22 -0600)]
Patron Stat Cat Enhancements: Rearrange stat cat editor screen
Rearrange the statistical categories editor interface to correctly
display the "Archived" radio buttons along side the other radio
buttons.
Signed-off-by: Scott Prater <sprater@gmail.com>
Signed-off-by: Ben Shum <bshum@biblio.org>
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Scott Prater [Thu, 16 Feb 2012 03:28:46 +0000 (21:28 -0600)]
Patron Stat Cat Enhancements: Fix values stored, then displayed in "Allow freetext" categories
In the patron registration screen: the widget dijit.form.FilteringSelect
stores the option value, not the displayed value, unlike ComboBox; so store
the FilteringSelect displayedValue, then set the FilteringSelect displayedValue
with the value retrieved from the patron/stat_cat_entry map table.
Signed-off-by: Scott Prater <sprater@gmail.com>
Signed-off-by: Ben Shum <bshum@biblio.org>
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Scott Prater [Wed, 18 Jan 2012 20:30:00 +0000 (14:30 -0600)]
Patron Stat Cat Enhancements: Enforce stat_cat "allow_freetext" flag in patron registration screen
If a patron statistical category is flagged to disallow user-provided
entries, make the category form field a FilteringSelect box; otherwise,
make it a ComboBox.
Signed-off-by: Scott Prater <sprater@gmail.com>
Signed-off-by: Ben Shum <bshum@biblio.org>
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Scott Prater [Wed, 18 Jan 2012 19:57:44 +0000 (13:57 -0600)]
Patron Stat Cat Enhancements: Enforce stat_cat "required" flag in patron registration screen
If a patron statistical category is flagged as required, make
the category form field a required field, and validate it before
submitting the form.
Signed-off-by: Scott Prater <sprater@gmail.com>
Signed-off-by: Ben Shum <bshum@biblio.org>
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Scott Prater [Tue, 27 Dec 2011 22:19:20 +0000 (16:19 -0600)]
Patron Stat Cat Enhancements: Modify stat cat editor HTML to manipulate patron stat cat default entries.
Signed-off-by: Scott Prater <sprater@gmail.com>
Signed-off-by: Ben Shum <bshum@biblio.org>
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Scott Prater [Tue, 27 Dec 2011 22:17:35 +0000 (16:17 -0600)]
Patron Stat Cat Enhancements: Modify stat cat editor javascript to manipulate patron stat cat default entries.
Add functions, methods, variables to Statistical Categories Editor
javascript to manage patron stat cat default entries.
Signed-off-by: Scott Prater <sprater@gmail.com>
Signed-off-by: Ben Shum <bshum@biblio.org>
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Scott Prater [Tue, 27 Dec 2011 22:10:00 +0000 (16:10 -0600)]
Patron Stat Cat Enhancements: Add language entities for default stat cat entry labels.
Add label entities for setting a default entry; rename staff.server.admin.stat_cat.edit_entry_name_submit
to staff.server.admin.stat_cat.edit_entry_submit.
Signed-off-by: Scott Prater <sprater@gmail.com>
Signed-off-by: Ben Shum <bshum@biblio.org>
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Scott Prater [Tue, 27 Dec 2011 22:06:19 +0000 (16:06 -0600)]
Patron Stat Cat Enhancements: Add permissions for manipulating stat_cat_entry_default.
Signed-off-by: Scott Prater <sprater@gmail.com>
Signed-off-by: Ben Shum <bshum@biblio.org>
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Scott Prater [Tue, 27 Dec 2011 21:56:25 +0000 (15:56 -0600)]
Patron Stat Cat Enhancements: Add Publisher actor methods for stat_cat_entry_default objects.
Add methods actor_stat_cat_entry_default and actor_stat_cat_entry_default_ancestor
to retrieve and populate stat_cat_entry_default objects. Modify ranged_actor_stat_cat_entry
and fleshed_actor_stat_cat to also include default entry objects, if present.
Signed-off-by: Scott Prater <sprater@gmail.com>
Signed-off-by: Ben Shum <bshum@biblio.org>
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Scott Prater [Tue, 27 Dec 2011 21:51:51 +0000 (15:51 -0600)]
Patron Stat Cat Enhancements: Add Pg DBI actor::stat_cat_entry_default table and sequence.
Add actor::stat_cat_entry_default->table and
actor::stat_cat_entry_default->sequence.
Signed-off-by: Scott Prater <sprater@gmail.com>
Signed-off-by: Ben Shum <bshum@biblio.org>
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Scott Prater [Tue, 27 Dec 2011 21:49:38 +0000 (15:49 -0600)]
Patron Stat Cat Enhancements: Add CDBI package actor::stat_cat_entry_default.
Signed-off-by: Scott Prater <sprater@gmail.com>
Signed-off-by: Ben Shum <bshum@biblio.org>
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Scott Prater [Tue, 27 Dec 2011 21:46:34 +0000 (15:46 -0600)]
Patron Stat Cat Enhancements: Link CDBI actor::stat_cat_entry_default to parent entities.
Add relations between actor::stat_cat and actor::stat_cat_entry to actor::stat_cat_entry_default.
Signed-off-by: Scott Prater <sprater@gmail.com>
Signed-off-by: Ben Shum <bshum@biblio.org>
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Scott Prater [Tue, 27 Dec 2011 21:42:44 +0000 (15:42 -0600)]
Patron Stat Cat Enhancements: Add OpenSRF CRUD methods for actor statistical category default entries.
Added methods to create, delete, update default entries for patron statistical
categories. Modified create_stat_cat and create_stat_cat_entry to also create,
update stat_cat_entry_default objects if present in the request.
Signed-off-by: Scott Prater <sprater@gmail.com>
Signed-off-by: Ben Shum <bshum@biblio.org>
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Scott Prater [Tue, 27 Dec 2011 21:36:15 +0000 (15:36 -0600)]
Patron Stat Cat Enhancements: Add OpenSRF methods for retrieving actor stat cat default entries.
Added the methods 'fetch_stat_cat_entry_default' and
'fetch_stat_cat_entry_default_by_stat_cat_and_org' for
fetching stat_cat_entry_default objects.
Signed-off-by: Scott Prater <sprater@gmail.com>
Signed-off-by: Ben Shum <bshum@biblio.org>
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>