Michael Peters [Wed, 11 Jul 2012 17:15:04 +0000 (13:15 -0400)]
Merge branch 'master' of git://git.evergreen-ils.org/Evergreen
Lebbeous Fogle-Weekley [Wed, 11 Jul 2012 14:54:44 +0000 (10:54 -0400)]
Avoid problem with 2.1 -> 2.2 upgrade script issuing error
The error is:
> ERROR: cannot ALTER TABLE "thesaurus" because it has pending
> trigger events.
Reported by Justin Hopkins, George Duimovich, and Bill Erickson.
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Signed-off-by: Justin Hopkins <hopkinsju@gmail.com>
Michael Peters [Tue, 10 Jul 2012 22:15:05 +0000 (18:15 -0400)]
Merge branch 'master' of git://git.evergreen-ils.org/Evergreen
Bob Wicksall [Fri, 29 Jun 2012 18:33:22 +0000 (14:33 -0400)]
TPac: Add paging to My Lists
- Added paging to My Lists based on the code from the Checkout History tab.
- Fixed a bug where adding more than 10 items to the Temporary list failed
- After adding paging renaming a list on page 2+ would fail. Fixed.
- Redirect after saving a list now leaves you on the same page
- Paging was bleeding between My Lists, Holds History and Circ History.
Fixed.
List contents were also limited to the first 10. I have upped the limit to
1000 rather than having nested paging. This should be revisited.
CSV download of lists is still limited to the first 10. Not sure where to
fix this.
Signed-off-by: Bob Wicksall <bwicksall@pls-net.org>
Signed-off-by: Ben Shum <bshum@biblio.org>
Signed-off-by: Jason Stephenson <jstephenson@mvlc.org>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Michael Peters [Tue, 10 Jul 2012 11:15:01 +0000 (07:15 -0400)]
Merge branch 'master' of git://git.evergreen-ils.org/Evergreen
Robert Soulliere [Tue, 19 Jun 2012 16:23:55 +0000 (12:23 -0400)]
Update Evergreen upgrade instructions to reflect the 2.2.0 release.
Update download reference to point to 2.2.0. Also moved
database updates to the end of the process. It seemed out of order since
the database update scripts were run before the download of the 2.2 tar file.
Signed-off-by: Robert Soulliere <robert.soulliere@mohawkcollege.ca>
Michael Peters [Wed, 27 Jun 2012 20:15:04 +0000 (16:15 -0400)]
Merge branch 'master' of git://git.evergreen-ils.org/Evergreen
Michael Peters [Wed, 27 Jun 2012 18:15:06 +0000 (14:15 -0400)]
Merge branch 'master' of git://git.evergreen-ils.org/Evergreen
Mike Rylander [Tue, 26 Jun 2012 19:03:37 +0000 (15:03 -0400)]
Teach the autosuggest web service to cache suggestions where appropriate
Should spare some DB load on sites.
LFW: I'm not sure the update to the Apache config made any difference,
but it doesn't hurt.
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Bill Erickson [Mon, 12 Mar 2012 19:05:50 +0000 (15:05 -0400)]
Org unit retrieval cleanup
Clean up and consolidate the various org unit retrieval method (in Perl)
to reduce code/confusion and make it easier to integrate changes to the
org unit tree in the future.
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Jason Stephenson <jstephenson@mvlc.org>
Michael Peters [Wed, 27 Jun 2012 15:15:05 +0000 (11:15 -0400)]
Merge branch 'master' of git://git.evergreen-ils.org/Evergreen
Bill Erickson [Tue, 12 Jun 2012 20:04:09 +0000 (16:04 -0400)]
tpac: repair some straggling bookbag CGI param names
We missed some going from "id" to "bbid"
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Jason Stephenson <jstephenson@mvlc.org>
Michael Peters [Tue, 26 Jun 2012 18:15:05 +0000 (14:15 -0400)]
Merge branch 'master' of git://git.evergreen-ils.org/Evergreen
Lebbeous Fogle-Weekley [Wed, 20 Jun 2012 15:13:11 +0000 (11:13 -0400)]
Acq: fix widget choice for user-linked fields in Acquisitions Search
The Acquisitions Search interface (which also sits underneath the
Purchase Orders inteface, My Selection Lists, and one or two others)
stopped presenting the correct widget for search terms linked to
actor.usr. This was brought on when PCRUD control was added to
actor.usr, so that means the bug affects only master, not rel_2_2 or
earlier.
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Michael Peters [Mon, 25 Jun 2012 16:15:05 +0000 (12:15 -0400)]
Merge branch 'master' of git://git.evergreen-ils.org/Evergreen
Galen Charlton [Mon, 18 Jun 2012 14:11:17 +0000 (10:11 -0400)]
lp#
1014664: add new columns to CDBI table definitions
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Michael Peters [Fri, 22 Jun 2012 17:15:04 +0000 (13:15 -0400)]
Merge branch 'master' of git://git.evergreen-ils.org/Evergreen
Thomas Berezansky [Wed, 13 Jun 2012 17:16:51 +0000 (13:16 -0400)]
Fix Title Holds
Holdable formats was being filled in with oargs, causing random failures.
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Michael Peters [Thu, 21 Jun 2012 14:15:05 +0000 (10:15 -0400)]
Merge branch 'master' of git://git.evergreen-ils.org/Evergreen
Lebbeous Fogle-Weekley [Thu, 21 Jun 2012 14:01:56 +0000 (10:01 -0400)]
Fix version numbers in 2.1 -> 2.2 upgrade script
Justin Hopkins spotted the problem, and offered a fix in LP #
1015807.
I'm just doing it slightly differently here. Thanks Justin!
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Michael Peters [Wed, 20 Jun 2012 14:15:05 +0000 (10:15 -0400)]
Merge branch 'master' of git://git.evergreen-ils.org/Evergreen
Thomas Berezansky [Tue, 19 Jun 2012 20:43:42 +0000 (16:43 -0400)]
Stop editing README header
We no longer have the version in the README header, so we don't need to
update it with a new value.
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Dan Scott <dan@coffeecode.net>
Dan Scott [Thu, 14 Jun 2012 19:16:51 +0000 (15:16 -0400)]
Avoid file extensions on scripts
Borrowing from the Debian policy, you might reimplement the same
functionality using a different language such as Perl or Python. So
avoid having a file extension in the first place. What are we, Windows
users?
Signed-off-by: Dan Scott <dan@coffeecode.net>
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Dan Scott [Mon, 4 Jun 2012 16:33:56 +0000 (12:33 -0400)]
Revert to generic ftp.mozilla.org hostname
download02.mozilla.org started returning 403 errors; ftp.mozilla.org
seems to work again, so let's go with that.
Signed-off-by: Dan Scott <dan@coffeecode.net>
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Dan Scott [Sun, 3 Jun 2012 03:25:53 +0000 (23:25 -0400)]
git2cl mangles the changelog; let's just use git's log
git2cl does bizarre things to line wrapping. The log it generates looks
deranged. Let's just use what git gives us; it's clean and easy to
parse, even if it doesn't adhere to the GNU changelog standards
(www.gnu.org/prep/standards/html_node/Style-of-Change-Logs.html).
Signed-off-by: Dan Scott <dan@coffeecode.net>
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Thomas Berezansky [Wed, 28 Sep 2011 19:05:22 +0000 (15:05 -0400)]
Release Building Script
make_release.sh [-v VERSION] [-f PREV_BRANCH | -t | -b] [-F PREV_VERSION] [-n] [-p]
VERSION is auto-detected by default and is based on the currently checked out branch.
PREV_BRANCH is auto-detected by default but that isn't reliable. Include remote name!
PREV_VERSION Is auto-detected by default and is based on the PREV_BRANCH's name.
-n specifies that you don't want an upgrade script to be auto-generated.
-p specifies that this is a preview build.
-t turns on tag only mode.
-b turns on build only mode.
NOTE: -t and -b override PREV_BRANCH/PREV_VERSION, but -b overrides -t.
When building a release you should have git2cl in your PATH as well as
all packages needed for building i18n and staff clients.
Usage examples:
Tagging a major version root (no need for git2cl/staff client deps):
git checkout -b rel_X_Y origin/master
build/tools/make_release.sh -t
Building a release:
git checkout -b rel_X_Y_Z rel_X_Y
build/tools/make_release.sh
Building a new major release:
git checkout -b rel_X_Y_Z rel_X_Y
build/tools/make_release.sh -f origin/tags/rel_U_V_W
Specifying a version outright:
build/tools/make_release.sh -v X.Y.Z
Very Specific Example: Building the 2.2 RC1 release:
git checkout -b rel_2_2_rc2 origin/rel_2_2
build/tools/make_release -f origin/rel_2_1 -n -p
Release files are placed in a "release" folder one level up from your git
root directory.
Nothing is pushed to remote servers, but dojo and xulrunner files may be
downloaded. Dojo to install in the release tarball properly, xulrunner for
building the staff client and avoiding issues with xulrunner changes if
end-users build a custom staff client (say, for autoupdate purposes).
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Dan Scott <dan@coffeecode.net>
Michael Peters [Mon, 18 Jun 2012 12:15:04 +0000 (08:15 -0400)]
Merge branch 'master' of git://git.evergreen-ils.org/Evergreen
Dan Scott [Sat, 16 Jun 2012 02:10:15 +0000 (22:10 -0400)]
TPAC: Add record detail navigation to page bottom
A usability rule of thumb suggests that navigation on long pages should
not require you to scroll back up to the top of the page from the
bottom; that gets old fast. We already do this on search results pages;
bring the same good practice to record details.
Signed-off-by: Dan Scott <dan@coffeecode.net>
Signed-off-by: Dan Wells <dbw2@calvin.edu>
Michael Peters [Thu, 14 Jun 2012 19:15:05 +0000 (15:15 -0400)]
Merge branch 'master' of git://git.evergreen-ils.org/Evergreen
Robert Soulliere [Thu, 14 Jun 2012 18:35:24 +0000 (14:35 -0400)]
Remove antiquated 1.6 directory from docs folder.
This was used for early DocBook testing and is no longer needed.
Signed-off-by: Robert Soulliere <robert.soulliere@mohawkcollege.ca>
Signed-off-by: Dan Scott <dan@coffeecode.net>
Michael Peters [Wed, 13 Jun 2012 16:15:05 +0000 (12:15 -0400)]
Merge branch 'master' of git://git.evergreen-ils.org/Evergreen
Lebbeous Fogle-Weekley [Tue, 12 Jun 2012 21:26:39 +0000 (17:26 -0400)]
Security fix: For auth, give same stacktrace for all cases of LOGIN_FAILED
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Lebbeous Fogle-Weekley [Mon, 11 Jun 2012 18:16:34 +0000 (14:16 -0400)]
Security fix: Prevent login by deleted and barred users
An existing comment in the code suggested that we thought we were already
keeping barred users out. LP #
1010671 brings up that deleted users were
not being kept out.
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Michael Peters [Wed, 13 Jun 2012 15:15:04 +0000 (11:15 -0400)]
Merge branch 'master' of git://git.evergreen-ils.org/Evergreen
Jason Stephenson [Mon, 11 Jun 2012 20:12:54 +0000 (16:12 -0400)]
Security fix for Launchpad Bug
1003052.
Bug reported by James Fournie:
Revoking the UPDATE_MARC permission doesn't actually seem to prevent a
user from editing a record. Our use case is that we would like a user
to create new records but not edit existing MARC records.
Changing CREATE_MARC to UPDATE_MARC in OpenILS::Application::Cat's
biblio_record_replace_marc() method seems to fix the problem.
Signed-off-by: Jason Stephenson <jstephenson@mvlc.org>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Thomas Berezansky [Wed, 13 Jun 2012 14:12:05 +0000 (10:12 -0400)]
Fix in-transit hold retarget
Tell the abort transit function to not commit our editor on us, basically.
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Michael Peters [Tue, 12 Jun 2012 21:15:05 +0000 (17:15 -0400)]
Merge branch 'master' of git://git.evergreen-ils.org/Evergreen
Mike Rylander [Fri, 8 Jun 2012 13:26:25 +0000 (09:26 -0400)]
Remove unsafe thesaurus/control-set mapping
Evergreen 2.2 and beyond includes new Authority Control Set functionality
intended to allow the definition of locally defined authority control
headings. The primary mechanism for determining which Control Set is used
by any given authority record is to look at the thesaurus fixed field
(mnemonic: Subj), which currently must be uniquely linked to a Control Set.
Failing that (in the case of no thesaurus code at all), there is a backup
mechanism: if the thesaurus value for the authority record is missing or not
used by any configured Control Set then Evergreen will look at the first Main
Entry (1xx) field in the record, and find a control set which uses this field.
This is, obviously, not perfect, but for non-overlapping authority field
schemes, it works very well.
However, the seed data for Evergreen currently includes the "no attempt to
code" value of "|" in the set of thesauri that point to the LoC Control Set.
This value ("|") is also the default value for the Subj fixed field. This
means that the fallback mechanism is very likely never reached, and anything
short of fully specifying an appropriate thesaurus code for any non-LoC
authority record will run afoul of a similar outcome as the bib-data loss
situation described in bug #983487.
We can avoid this situation in most cases by /not/ tying the "|" thesaurus
value to the LoC control set.
This commit accomplishes this goal by allowing the Control Set for a thesaurus
to be NULL, removing the Control Set for "|" and removing the Control Set
recorded for records with "|" as the thesaurus value, thereby forcing Main
Entry inspection on any use of the authority record where Control Set is
required.
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Michael Peters [Tue, 12 Jun 2012 17:15:04 +0000 (13:15 -0400)]
Merge branch 'master' of git://git.evergreen-ils.org/Evergreen
Dan Wells [Tue, 12 Jun 2012 13:03:31 +0000 (09:03 -0400)]
Serial Note Sort Fix
Serial notes are currently sorting backwards from what is intended
(and what is expected based on other interfaces). This was caused
by adding a sort to the middle-layer code which resulted in an
unwanted double reverse.
[whitespace adjustment by LFW per request of DBS]
Signed-off-by: Dan Wells <dbw2@calvin.edu>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Thomas Berezansky [Mon, 11 Jun 2012 13:43:08 +0000 (09:43 -0400)]
Vandelay: Add some padding for inspect queue list
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Thomas Berezansky [Mon, 11 Jun 2012 13:26:17 +0000 (09:26 -0400)]
Vandelay: Update Current Type/ID on queue retrieve
Because other parts of the javascript need those values.
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Thomas Berezansky [Wed, 14 Mar 2012 16:04:25 +0000 (12:04 -0400)]
Vandelay: Rewrite Inspect Queues Interface
This accomplishes several things:
1 - Load the list of queues on page load
2 - Single-click access (rather than select and click) to queues
3 - Batch Deletion of Queues
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Michael Peters [Mon, 11 Jun 2012 20:15:04 +0000 (16:15 -0400)]
Merge branch 'master' of git://git.evergreen-ils.org/Evergreen
Jason Etheridge [Fri, 20 Apr 2012 02:37:56 +0000 (22:37 -0400)]
fix double-click in Holdings Maintenance
so that it won't attempt to spawn the Item Editor for non-items
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Signed-off-by: Jason Stephenson <jstephenson@mvlc.org>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Michael Peters [Mon, 11 Jun 2012 18:15:05 +0000 (14:15 -0400)]
Merge branch 'master' of git://git.evergreen-ils.org/Evergreen
Robert Soulliere [Mon, 11 Jun 2012 18:13:33 +0000 (14:13 -0400)]
Merge remote branch 'origin' into documentation_test
Ben Shum [Sun, 27 May 2012 20:55:39 +0000 (16:55 -0400)]
Convert docs files from DOS to UNIX format.
Signed-off-by: Ben Shum <bshum@biblio.org>
Signed-off-by: Robert Soulliere <robert.soulliere@mohawkcollege.ca>
Dan Wells [Mon, 11 Jun 2012 15:18:08 +0000 (11:18 -0400)]
Show Vandelay Buckets in Manage Record Buckets
The 'Manage Record Buckets' view is currently filtered to show
only 'staff_client' type buckets. This expands the filter to
include 'vandelay_queue' buckets.
Signed-off-by: Dan Wells <dbw2@calvin.edu>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Robert Soulliere [Mon, 11 Jun 2012 17:27:07 +0000 (13:27 -0400)]
Remove licensing info redarding removed PDF icon.
Signed-off-by: Robert Soulliere <robert.soulliere@mohawkcollege.ca>
Michael Peters [Mon, 11 Jun 2012 17:15:05 +0000 (13:15 -0400)]
Merge branch 'master' of git://git.evergreen-ils.org/Evergreen
Steven Callender [Thu, 19 Apr 2012 13:47:46 +0000 (09:47 -0400)]
Added a days_back parameter to authority_control_fields.pl in order to process bibs edited X amount of days ago.
The days_back parameter can be used to easily run the script through cron nightly and have it process all newly created or newly added bib records. Ideally it would be ran once a day at nighttime prior to midnight using the --days_back 0 option.
Signed-off-by: Steven Callender <stevecallender@esilibrary.com>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Michael Peters [Mon, 11 Jun 2012 16:15:05 +0000 (12:15 -0400)]
Merge branch 'master' of git://git.evergreen-ils.org/Evergreen
Bill Erickson [Fri, 8 Jun 2012 19:51:50 +0000 (15:51 -0400)]
Load Vandelay queue list in Inspect Queue
When the Inspect Queue tab is opened, ensure the list of queues for the
default selected type (bib queues) is loaded.
https://bugs.launchpad.net/evergreen/+bug/
1010636
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Michael Peters [Tue, 10 Apr 2012 20:12:13 +0000 (16:12 -0400)]
LP#845096 - coded_value_map_id_seq doesn't have a proper last_value
Thanks to Kathy Lussier for the original report. Kathy discovered
that users were unable to add new Coded Value Maps via the staff client.
With some log digging, I discovered the culprit was a rash of
primary key errors.
With help from Dan Scott, I was able to rectify this via a quick bit
of SQL which properly sets the last_value in the sequence.
Thanks, Kathy and Dan!
Signed-off-by: Michael Peters <mrpeters@library.in.gov>
Signed-off-by: Jason Stephenson <jstephenson@mvlc.org>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Michael Peters [Fri, 8 Jun 2012 21:15:04 +0000 (17:15 -0400)]
Merge branch 'master' of git://git.evergreen-ils.org/Evergreen
Dan Wells [Thu, 7 Jun 2012 14:32:59 +0000 (10:32 -0400)]
Fix broken non-RSS bookbag feeds
This commit addresses LP#
1010036 by defining a stub 'description()'
method. Lack of such a method was causing internal server errors
for other kinds of feeds.
Signed-off-by: Dan Wells <dbw2@calvin.edu>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Michael Peters [Thu, 7 Jun 2012 05:15:05 +0000 (01:15 -0400)]
Merge branch 'master' of git://git.evergreen-ils.org/Evergreen
James Fournie [Wed, 6 Jun 2012 21:47:30 +0000 (14:47 -0700)]
LP1009752: activate purchase orders with patron requests
Simple typo: "actor_hold_request" should be "action_hold_request".
Signed-off-by: Dan Scott <dan@coffeecode.net>
Michael Peters [Thu, 7 Jun 2012 04:15:05 +0000 (00:15 -0400)]
Merge branch 'master' of git://git.evergreen-ils.org/Evergreen
Dan Scott [Thu, 7 Jun 2012 03:19:10 +0000 (23:19 -0400)]
Update 2.1.2 DB schema upgrade script
As part of the march to 2.1.2, and in time for 2.2.0, update the
2.1.1-2.1.2 update script.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Michael Peters [Wed, 6 Jun 2012 22:15:05 +0000 (18:15 -0400)]
Merge branch 'master' of git://git.evergreen-ils.org/Evergreen
Dan Scott [Wed, 6 Jun 2012 21:43:33 +0000 (17:43 -0400)]
Add TPAC translations
We're still working out our translation update process; new PO files can
fairly easily slip through the net. Fix that for TPAC, which is a pretty
big deal for 2.2.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Michael Peters [Wed, 6 Jun 2012 21:15:06 +0000 (17:15 -0400)]
Merge branch 'master' of git://git.evergreen-ils.org/Evergreen
Lebbeous Fogle-Weekley [Mon, 4 Jun 2012 22:15:57 +0000 (18:15 -0400)]
Commit i18n POT file changes after 'make newpot'
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Wed, 6 Jun 2012 20:39:10 +0000 (16:39 -0400)]
Import updated translations from Launchpad
Lebbeous Fogle-Weekley originally imported these updated translations
from Launchpad. Dan Scott just weeded out a few metadata-only changes
to PO files that didn't need to be pushed to git.
Signed-off-by: Dan Scott <dscott@laurentian.ca>
Michael Peters [Wed, 6 Jun 2012 14:15:04 +0000 (10:15 -0400)]
Merge branch 'master' of git://git.evergreen-ils.org/Evergreen
Lebbeous Fogle-Weekley [Tue, 5 Jun 2012 21:44:37 +0000 (17:44 -0400)]
Address LP #983487: Avoid clobbering bib records at authority merge
If you've set up a relationship between bib record and authority records
based on arbitrary sets of controlling and controlled fields, but your
authority records don't have the right Subj fixed field value
corresponding to a control set that defines the controlling and
controlled fields you're using, authority merge operations may wipe out
lots of bib data.
Yamil Suarez encountered this bug in testing, and in his case what he
needed to do was set the Subj fixed field in his authority records to
'A' to match his Song Title Index (see the launchpad bug referened
above).
Previously, you could not actually save the Subj fixed field in the MARC
editor (which showed HeadSubj instead of Subj for authority records, and
didn't work). Now you can.
Thanks to Mike Rylander for help in figuring out the above.
To provide additional protection against merging authority records when
they might not be linked with the right control set, the Manage
Authorities interface will now also show you the linked control set for
any given records.
The implementation of that last bit incidentally meant making sure flesh
and flesh_fields get passed through to PermaCrud for retrieve() calls via
the Javascript openils.PermaCrud wrapper.
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Michael Peters [Tue, 5 Jun 2012 14:15:04 +0000 (10:15 -0400)]
Merge branch 'master' of git://git.evergreen-ils.org/Evergreen
Dan Scott [Tue, 5 Jun 2012 13:17:52 +0000 (09:17 -0400)]
Move 2.0.11 upgrade script into version_upgrade dir
Signed-off-by: Dan Scott <dan@coffeecode.net>
Jason Stephenson [Thu, 10 May 2012 17:56:41 +0000 (13:56 -0400)]
Add the 2.0.10-2.0.11 upgrade script.
Signed-off-by: Jason Stephenson <jstephenson@mvlc.org>
Signed-off-by: Dan Scott <dan@coffeecode.net>
Michael Peters [Mon, 4 Jun 2012 19:15:05 +0000 (15:15 -0400)]
Merge branch 'master' of git://git.evergreen-ils.org/Evergreen
Dan Scott [Sun, 3 Jun 2012 00:06:30 +0000 (20:06 -0400)]
Distinguish route-to-cataloging exception circ messages
It appears as though a copy-and-paste error introduced duplicate keys in
circ.properties, which in turn makes newer versions of the Translate
Toolkit unhappy and results in empty translated files. Tracing through
the pertinent code in xul/staff_client/server/circ/util.js, it looks
like the desired key was for "not_found" for the second "cataloging" key
- so change that accordingly.
Signed-off-by: Dan Scott <dan@coffeecode.net>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Dan Scott [Sat, 2 Jun 2012 23:51:55 +0000 (19:51 -0400)]
Fix check for duplicate strings in i18n properties
We had the core of the check in place - just failed to check the
property we were iterating over. Doh.
Signed-off-by: Dan Scott <dan@coffeecode.net>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Michael Peters [Sun, 3 Jun 2012 06:15:05 +0000 (02:15 -0400)]
Merge branch 'master' of git://git.evergreen-ils.org/Evergreen
Dan Scott [Sun, 3 Jun 2012 05:09:26 +0000 (01:09 -0400)]
Improve Fedora prereqs and instructions
Fedora 16 and 17 need the makensis package.
As well, make the Makefile.install target "fedora" to match the OpenSRF
target, and adjust the docs accordingly. This should lead to fewer
changes in the future as Fedora 18, 19, etc roll out.
Signed-off-by: Dan Scott <dan@coffeecode.net>
Michael Peters [Sun, 3 Jun 2012 04:15:05 +0000 (00:15 -0400)]
Merge branch 'master' of git://git.evergreen-ils.org/Evergreen
Michael Peters [Sun, 3 Jun 2012 03:15:05 +0000 (23:15 -0400)]
Merge branch 'master' of git://git.evergreen-ils.org/Evergreen
Jason Etheridge [Wed, 9 May 2012 14:30:17 +0000 (10:30 -0400)]
LP975422 patron search from portal/splash page
make it consider the "Patron circulation summary is horizontal" library setting
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Signed-off-by: Dan Scott <dan@coffeecode.net>
Bill Erickson [Thu, 3 May 2012 20:36:38 +0000 (16:36 -0400)]
TPAC: Prevent unitialized variable warnings in My Account (repair)
The logic in the second IF test was slightly altered by the fix. An
undef value for username_unlimit should result in executing the block.
Since org setting values are stored as real boolean values, I simplified
the test to a simple if(!username_unlimit) test.
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Dan Scott <dan@coffeecode.net>
Dan Scott [Wed, 11 Apr 2012 03:34:24 +0000 (23:34 -0400)]
TPAC: Prevent unitialized variable warnings in My Account
Viewing a user's account preferences would trigger two uninitialized
variable warnings if the corresponding org unit settings were not set.
Signed-off-by: Dan Scott <dan@coffeecode.net>
Michael Peters [Sun, 3 Jun 2012 00:15:05 +0000 (20:15 -0400)]
Merge branch 'master' of git://git.evergreen-ils.org/Evergreen
Bill Erickson [Fri, 23 Mar 2012 19:17:50 +0000 (15:17 -0400)]
ACQ guarantee no PO re-activation
Prevent the possibility of double PO activation by preventing it within
the API. There have been reports in the wild of double-activation, even
though the UI is supposed to prevent it.
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Michael Peters <mrpeters@library.in.gov>
Signed-off-by: Dan Scott <dan@coffeecode.net>
Michael Peters [Fri, 1 Jun 2012 21:15:04 +0000 (17:15 -0400)]
Merge branch 'master' of git://git.evergreen-ils.org/Evergreen
Lebbeous Fogle-Weekley [Fri, 1 Jun 2012 19:43:54 +0000 (15:43 -0400)]
Fix broken menu entries under "Other -> Booking" in patron interface
This issue was reported to me by Steve Callender. The menu entries
under "Other -> Booking" had all stopped working.
There's a catalog of URL constants under window.urls sometimes, and
formerly (or other times?) at xulG.urls for XUL-based staff client
interfaces. There's a new-tab-opening method that needed to be more
flexible when looking for that catalog.
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Michael Peters [Fri, 1 Jun 2012 20:15:05 +0000 (16:15 -0400)]
Merge branch 'master' of git://git.evergreen-ils.org/Evergreen
Bill Erickson [Fri, 1 Jun 2012 14:28:28 +0000 (10:28 -0400)]
Override arguments parameter repairs
In some cases, the override arguments were passed as a paramater after
an @array or %hash argument. In such cases, any params following are
clumped into the array/hash and the trailing parameters get no values.
Let's explicitly push the $oargs into the preceeding structures.
In the case of Circulate.pm:new, no $oargs argument is needed, as all keys
within the %args hash are tacked onto the circulator object.
Also, for consistency, this change affects one of the hold API calls by
moving $oargs into $params even when not strictly necessary.
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Galen Charlton [Fri, 1 Jun 2012 03:31:11 +0000 (23:31 -0400)]
lp#
1007248: tweak order in which pgt rows are renumbered
Need to renumber from highest to lowest. Because the primary
key constraint is not deferred, doing the renumbering in a single
statement will fail if there is overlap between the set of
existing pgt.id values and the set of {pgt.id + 100}.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Michael Peters [Fri, 1 Jun 2012 19:15:05 +0000 (15:15 -0400)]
Merge branch 'master' of git://git.evergreen-ils.org/Evergreen
Bill Erickson [Fri, 25 May 2012 18:41:18 +0000 (14:41 -0400)]
TPAC bookbag CGI param changed to bbid
To avoid propagating a generic URL parameter like 'id', which can be
picked up by other pages and cause breakage, use 'bbid' instead. Also,
clear the 'bbid' param from the my-account tabs.
While we're in there, silence an uninitialized string warning.
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Michael Peters [Thu, 31 May 2012 15:15:05 +0000 (11:15 -0400)]
Merge branch 'master' of git://git.evergreen-ils.org/Evergreen
Jason Etheridge [Fri, 20 Apr 2012 02:22:53 +0000 (22:22 -0400)]
Work Log entry for holds placed from "Search the Catalog"
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Jason Etheridge [Fri, 20 Apr 2012 01:02:12 +0000 (21:02 -0400)]
Work Log entry for holds placed within patron display
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Jason Etheridge [Fri, 20 Apr 2012 01:01:35 +0000 (21:01 -0400)]
fix error reporting when using list.wrap_in_full_retrieve
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Jason Etheridge [Tue, 17 Apr 2012 21:03:21 +0000 (17:03 -0400)]
work log entries for payments received
Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Michael Peters [Wed, 30 May 2012 19:15:05 +0000 (15:15 -0400)]
Merge branch 'master' of git://git.evergreen-ils.org/Evergreen
Jeff Davis [Wed, 11 Apr 2012 16:04:19 +0000 (12:04 -0400)]
LP#856708 - Scrolling/div size issues in action trigger interface
The event definition content pane does not properly accommodate its contents.
In the Event Definitions tab, the list of event definitions exceeds the height of the
pane, but you can't scroll all the way down to the bottom of the list -- some of the
content gets cut off. Likewise, when editing an event definition, you can't scroll
all the way to the bottom of the page; the Cancel and Save buttons are cut off, and
you have to use the Tab key to move the focus down to those buttons, which forces
the pane to scroll to the bottom so that they're visible.
Signed-off-by: Jeff Davis <jdavis@sitka.bclibraries.ca>
Signed-off-by: Michael Peters <mrpeters@library.in.gov>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Michael Peters [Sat, 26 May 2012 17:15:05 +0000 (13:15 -0400)]
Merge branch 'master' of git://git.evergreen-ils.org/Evergreen
Galen Charlton [Sat, 26 May 2012 16:42:20 +0000 (12:42 -0400)]
trivial whitespace change
(for testing post-receive hook after Gitolite upgrade)
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Galen Charlton [Sat, 26 May 2012 16:17:58 +0000 (12:17 -0400)]
DOC: fix a couple typos
Signed-off-by: Galen Charlton <gmc@esilibrary.com>