Dan Wells [Thu, 16 Jan 2014 21:01:09 +0000 (16:01 -0500)]
Rejigger 2.4.3-2.5.0 upgrade bits
As reported in LP#1261355, Postgres fails in some cases when changing
constraints on existing data inside a transaction. This may or may not
fix the actual problem, but it at least tidies up these changes, and
will make it much cleaner to move outside the transaction if needed.
Signed-off-by: Dan Wells <dbw2@calvin.edu> Signed-off-by: Remington Steed <rjs7@calvin.edu>
Dan Wells [Thu, 16 Jan 2014 20:07:40 +0000 (15:07 -0500)]
Changes to smooth out make_release
1) Make the fake 'HeadURL' into a URL which works with our web repo.
Note that this has 'tags/' hardcoded in, so it only works with true
release branches (e.g. rel_x_y_z) not "working" branches
(e.g. rel_x_y).
2) Change range selector when building log to better exclude commits
from previous releases.
Dan Scott [Fri, 25 Oct 2013 17:54:35 +0000 (13:54 -0400)]
Add pgTAP test for normalized MARC records
Specifically, we're concerned about ensuring that any changes related to
the fix for Encode (requiring the removal of the effectively useless but
now erroring decode_utf8()) do not inadvertently change the content of
the MARC records on ingest. Because we wouldn't want to have to reingest
everything to normalize search, etc.
Signed-off-by: Dan Scott <dscott@laurentian.ca> Signed-off-by: Dan Wells <dbw2@calvin.edu>
Dan Scott [Mon, 21 Oct 2013 15:58:06 +0000 (11:58 -0400)]
Encode.pm change to the UTF8 flag
In the past, decode_utf8() silently ignored attempts to decode data
with the UTF8 flag on. However, Encode.pm changed around 2.53 and
resulted in wide-character errors preventing the likes of
--load-all-sample from working.
Since our data should already be UTF8 when it hits these functions, we
should not be trying to decode it in the first place.
Signed-off-by: Dan Wells <dbw2@calvin.edu> Signed-off-by: Dan Scott <dscott@laurentian.ca>
Ben Shum [Sat, 8 Feb 2014 08:42:07 +0000 (03:42 -0500)]
LP1125471 - Use label instead of id in recording in-house use prompt
When recording multiple in-house use with the library settings for threshold
prompts, the prompt would bring up the ID as the variable instead of the name
of the non-cataloged material. This caused confusion among staff members who
might see a message like: "Are you sure you want to mark 9 as having been used
21 times?" (9 being the id, not the name of the non-cataloged material)
This commit leverages existing code which had been commented out and under
the ID to use the label name for the non-cataloged material instead. Also,
minor bugfix with a missing semi-colon at the end of the function being used.
Signed-off-by: Ben Shum <bshum@biblio.org> Signed-off-by: Bill Erickson <berick@esilibrary.com>
Bill Erickson [Mon, 30 Dec 2013 18:49:01 +0000 (13:49 -0500)]
Vandelay: increase queued item creation timeout
Allow up to 10 minutes to create each queued vandelay record to avoid
timeouts in item creation caused by pathologicaly long-running record
match set queries.
Signed-off-by: Bill Erickson <berick@esilibrary.com> Signed-off-by: Ben Shum <bshum@biblio.org>
Mike Rylander [Thu, 12 Sep 2013 17:26:21 +0000 (13:26 -0400)]
Keep standard INNER joins above possible OUTERs
We always join metabib.record_attr, and we always use an INNER join
to the core table, so keep that join first. Likewise with the join
to biblio.record_entry. Dynamic joins may be OUTER, though, and while
join reordering in Postgres is smart, let's not give it the chance to
fail.
Signed-off-by: Mike Rylander <mrylander@gmail.com> Signed-off-by: Ben Shum <bshum@biblio.org>
Dan Wells [Fri, 9 Nov 2012 21:12:58 +0000 (16:12 -0500)]
Prevent odd TPAC base URL redirect
As it stands, in a default install, if you browse to
http://yourserver.com/eg/opac
you are redirected to a login page, and if you login, you then get
to the 404 page. This behavior is caused by the fact that *any*
URLs which do not match a few select cases are assumed to be
"secure" resources, when in fact they might not even exist.
This commit catches any attempt to browse this 'base' and simply
redirects to the "home" page instead.
This addresses the most obvious and likely 404 of this type, but
we might consider catching some other cases (e.g. eg/opac/record/).
In addition (or as an alternative), we could also create a function
call which simply checks the validity of a URL before we ask the
user to login to see it.
Signed-off-by: Dan Wells <dbw2@calvin.edu> Signed-off-by: Bill Erickson <berick@esilibrary.com>
Mike Rylander [Tue, 21 Jan 2014 17:31:13 +0000 (12:31 -0500)]
Use copy owning library as the context for finding best hold sort order setting
In the olden days before best hold sort order and proximity adjustment, there was
no need to consider any context org other than "here", because the choices were,
essentially, FIFO or Traditional applied within the hard-boundary range. However,
now we need to decided whose rule to follow, and the most correct arbiter of that
is the owning library of the call number of the copy. We avoid copy circ lib
because that can change with floating copies.
Signed-off-by: Mike Rylander <mrylander@gmail.com> Signed-off-by: Ben Shum <bshum@biblio.org>
Kyle Tomita [Thu, 6 Feb 2014 00:23:18 +0000 (16:23 -0800)]
LP1155769: Items repeated in tpac display, others not visible
This was an issue with the query and ordering by a column that was
sometimes null (copy_number). Added barcode to be a sort rather than
replacing copy_number, per bshum's suggestion. Not replacing allows
libraries that use copy_number to continue to use them as well.
Signed-off-by: Kyle Tomita <tomitakyle@gmail.com> Signed-off-by: Ben Shum <bshum@biblio.org>
Form submission for list creation with an empty name value now prevents
list creation and redirects the user to a new error page explaining why
list creation failed.
Signed-off-by: Bill Erickson <berick@esilibrary.com> Signed-off-by: Ben Shum <bshum@biblio.org>
Jeff Godin [Wed, 30 Oct 2013 17:20:28 +0000 (13:20 -0400)]
Skip duplicate username check when username unchanged
Changing a username, then changing back to the user's current
username results in a duplicate username detection -- a false
positive due to the API call finding a user with that username --
the current user. This prevents you from saving any other changes
you may have made to the user.
This can be prevented by skipping the duplicate username check if
the user is not new and the username in the field matches the
username stored in the in-memory Javascript representation of the
user.
There's still a potential corner case which could be avoided by
using a new/modified API call to either accept an "except this
au.id" argument or to return the au.id of the found user, but I
don't see a need for that at this point.
Signed-off-by: Jeff Godin <jgodin@tadl.org> Signed-off-by: Ben Shum <bshum@biblio.org>
Ben Shum [Tue, 21 Jan 2014 18:52:49 +0000 (13:52 -0500)]
LP1271218 - clarify how opt-in user notifications are shown in my account
As reported in LP127128, end users may not need to be shown the message that
"No notification preferences are configured" when in fact this message is only
displayed when the user opt-in notification settings are not configured.
So, alter this to only show the table and div when there are settings to be
configured and otherwise show nothing.
Signed-off-by: Ben Shum <bshum@biblio.org> Signed-off-by: Chris Sharp <csharp@georgialibraries.org> Signed-off-by: Ben Shum <bshum@biblio.org>
Remington Steed [Wed, 27 Nov 2013 14:55:35 +0000 (09:55 -0500)]
LP#842991 Reports needs to error when deleting fails
When attempting to delete a report template, the reports interface
incorrectly shows "Action Succeeded" even when it partly fails. If the
user performing the delete does not own all the dependent reports and
outputs, then the perl function returns 1 to indicate that some were
deleted, but not all. However, the javascript that calls that function
does not check for a return value of 1. This commit adds that check, and
also improves the formatting of the related error messages.
Signed-off-by: Remington Steed <rjs7@calvin.edu> Signed-off-by: Dan Wells <dbw2@calvin.edu>
Serials: improve routing slips per Dan Wells' suggestions on LP #1229349
- Don't repeat the same address for the same user
- Label mailing vs. billing
- Border to separate mailing and billing addresses
- [Also] move some inline styles to a CSS file
Steven Callender [Thu, 10 Oct 2013 20:09:06 +0000 (16:09 -0400)]
Fixed title/author display at checkout for non-pre-cat items.
Fixed a display problem on checkout where items that were formely pre-cats
were still displaying the pre-cat data. Now it will make sure the item is
still a pre-cat before using the dummy data.
Signed-off-by: Steven Callender <stevecallender@esilibrary.com> Signed-off-by: Ben Shum <bshum@biblio.org>
Dan Scott [Thu, 16 Jan 2014 03:33:25 +0000 (22:33 -0500)]
TPAC: Display authors using inline-block
Rather than letting author credits wrap willy-nilly, use inline-block mode so
that each line will begin with a new author. Devices with constrained screens
in particular benefit from this, as the list of authors is much easier to scan,
and wider screens can still fit multiple authors on a single line.
Signed-off-by: Dan Scott <dscott@laurentian.ca> Signed-off-by: Ben Shum <bshum@biblio.org>
Dan Scott [Wed, 15 Jan 2014 20:25:02 +0000 (15:25 -0500)]
TPAC: Use indexed subfields only in author search links
Addresses LP# 1267231 in which we found that the titles of works in the added
author field (such as subfield t) were showing up in the link ahead of the
author's birth and death date (if applicable). Now we reserve the link for
only the indexed author subfields (depends on whether the name is personal,
corporate, or conference, but generally subfields a/b/c/d/e/n/q), then the
extra subfields go after the name + dates, then we finally put the relationship
into the parentheses after everything else.
We also simplify the markup so that each name is contained in a single <span
class="rdetail_author_div"> element to make it easier to control the layout.
Signed-off-by: Dan Scott <dscott@laurentian.ca> Signed-off-by: Ben Shum <bshum@biblio.org>
Robert Soulliere [Tue, 21 Jan 2014 18:04:08 +0000 (13:04 -0500)]
Documentation: Update upgrade instructions to 2.5.2
Update instructions to point ot latest release in 2.5 series.
Fix download location which was pointing to preview directory and not the stable release download directory.
Signed-off-by: Robert Soulliere <robert.soulliere@mohawkcollege.ca>
Serials: Batch Receive interface Copy Location widget was inert
Choosing a value from the Copy Location widget wasn't working. You'd
get a default copy location (or the one supplied by the Receive Unit
Copy Template) no matter what you set that control too.
This is fixed. One does not read from XUL menulist element by using its
'value' property.
LP#882586: In Serial Control View, show copy templates owned by ancestors
When creating/editing distributions, dropdowns for Receive Unit Template
and Bind Unit Template now show copy templates owned not only at the
distribution's holding lib, but at any of the holding lib's ancestors.
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com> Signed-off-by: Dan Wells <dbw2@calvin.edu>
Dan Scott [Mon, 20 Jan 2014 03:24:07 +0000 (22:24 -0500)]
Create 008 - take only the first field/subfield combo
In the event that there were multiple $a subfields in, say, 044, the create 008
function could spew raw XML into the 008 field. Avoid that by taking the primary
instance.
Pasi Kallinen [Thu, 18 Jul 2013 18:00:31 +0000 (21:00 +0300)]
Allow generating fixed data in control field 008 quickly
Language and country codes come from 041a and 044a,
Date1 comes from 260c, and the record date is set to current day.
Signed-off-by: Pasi Kallinen <pasi.kallinen@pttk.fi> Signed-off-by: Dan Scott <dscott@laurentian.ca>
Conflicts:
Open-ILS/xul/staff_client/server/cat/marcedit.js
Galen Charlton [Fri, 4 Oct 2013 21:44:56 +0000 (14:44 -0700)]
LP#1235474: fix failure of authority browse context menu to render
This patch fixes a situation where if an authority record that would
be brought up by the authority browse context menu in the MARC editor
lacks an 003 field, the context menu would not be rendered all, meaning
that the default context menu (e.g., cut/copy/paste/etc.) would be
displayed instead.
Signed-off-by: Galen Charlton <gmc@esilibrary.com> Signed-off-by: Dan Scott <dscott@laurentian.ca>
Elliot Voris [Mon, 9 Dec 2013 18:57:20 +0000 (12:57 -0600)]
LP104785: Selfcheck needs to be run with HTTPS
Redirect attempts to connect to the self-check via HTTP to the more secure
HTTPS instead. Addresses this bug reported in launchpad:
https://bugs.launchpad.net/evergreen/+bug/1047485
Based on work for Apache 2.2 by Michael Peters <mrpeters@library.in.gov>,
updated and applied to 2.4 by Elliot Voris.
Signed-off-by: Elliot Voris <evoris@slcconline.edu> Signed-off-by: Dan Scott <dscott@laurentian.ca>
Dan Scott [Sun, 19 Jan 2014 16:30:57 +0000 (11:30 -0500)]
Fedora: Net::SSLeay 1.55 is too new for Net::HTTPS::Any
Although Net::HTTPS:Any wants Net:SSLeay 1.30 or later, 1.55 is apparently too
late, or something. The alternative is Crypt::SSLeay, which seems to work, so
let's go with that.
Pasi Kallinen [Fri, 28 Jun 2013 05:47:11 +0000 (08:47 +0300)]
Replace deprecated javascript escape() with encodeURIComponent()
Signed-off-by: Pasi Kallinen <pasi.kallinen@pttk.fi> Signed-off-by: Dan Scott <dscott@laurentian.ca>
Conflicts:
Open-ILS/xul/staff_client/chrome/content/auth/controller.js
Open-ILS/xul/staff_client/chrome/content/util/error.js
Open-ILS/xul/staff_client/chrome/content/util/print.js
Open-ILS/xul/staff_client/server/admin/offline_manage_xacts.js
Open-ILS/xul/staff_client/server/circ/print_list_template_editor.js
Mike Rylander [Thu, 16 Jan 2014 18:58:12 +0000 (13:58 -0500)]
Fix proximity adjustment calculator
The canonical use case for proximity adjustment is to use it broadly
to effect the local proximity of items within a particular area, in
a like manner, across many parts of the org tree. However, in cases
where it is lightly used, or used with non-overlapping criteria columns,
there are cases where the adjustment will spread beyond its intended
range of influence.
The changes here create a much stricter and correct test for rule
matching, which will end in the correct choice of rules in all cases.
Signed-off-by: Mike Rylander <mrylander@gmail.com> Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com> Signed-off-by: Mike Rylander <mrylander@gmail.com>
In prereq installer, don't try to chown extracted files to original UID/GID
As this Makefile is designed to be used by a make process running as
root, this will avoid problems on some systems when tar extracts
files and tries to give them the same UID/GID as they have in their
archives, but those accounts don't exist on the local system.
e.g, libdbi has files set 1000/1000. On most systems, there's a user
and a group with these IDs, but there can be systems where nothing
uses those IDs, and where tar fails with e.g. 'tar: libdbi-0.8.3:
Cannot change ownership to uid 1000, gid 1000: Invalid argument'
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com> Signed-off-by: Mike Rylander <mrylander@gmail.com>
Galen Charlton [Tue, 14 Jan 2014 18:30:48 +0000 (13:30 -0500)]
LP#1234201: fix menu item to display patron requests (if summary is horizontal)
This patch adds a missing command element to the horizontal
patron summary display so that the 'Acquisition Requests' menu
item will work.
To test:
[1] Set the Patron circulation summary is horizontal library setting
to true.
[2] Retrieve a patron and try using the Acquisition Requests menu
item. It will do nothing.
[3] Apply the patch and clear cache in the staff client.
[4] Repeat step 2. This time, the Acquisitions Request menu item
should bring up the list of the patron's requests.
Signed-off-by: Galen Charlton <gmc@esilibrary.com> Signed-off-by: Srey Seng <sreyseng@gmail.com>
Galen Charlton [Tue, 14 Jan 2014 16:00:38 +0000 (11:00 -0500)]
LP#1269042: prevent acq seach from building dropdown of every copy ID in the DB
This patch ensures that if a user sets a search field in the
acquisitions general search form to the line item details copy ID
(labeled "LID - Evergreen Copy ID"), the form presents a normal
input widget rather than trying to build a drop-down containing
every copy ID in the database. Except for very small databases,
the previous behavior would mean that an open-ils.pcrud backend
would eventually consume a great deal of memory trying to service
a request for all copies in the system.
Signed-off-by: Galen Charlton <gmc@esilibrary.com> Signed-off-by: Mike Rylander <mrylander@gmail.com>
Jeff Godin [Wed, 30 Oct 2013 19:29:24 +0000 (15:29 -0400)]
Treat empty username as invalid in user editor
There seems to be undesired interaction between the required
attribute and the isValid method on a dojo/dijit ValidationTextBox.
If both are set, isValid needs to check for an empty value,
otherwise the field is considered valid the moment it gains focus.
We don't want an empty username to be considered valid, because we
know that we will be unable to save the user.
We can work around this by teaching the isValid function to consider
an empty value as invalid.
Signed-off-by: Jeff Godin <jgodin@tadl.org> Signed-off-by: Melissa Ceraso <mceraso@biblio.org> Signed-off-by: Ben Shum <bshum@biblio.org>
Srey Seng [Tue, 7 Jan 2014 22:30:49 +0000 (14:30 -0800)]
LP#1266937: Fix missing/incorrect regex for authority in Vandelay.pm
Add in missing "~" in function import_record_list_impl when
type is authority records. Also replace "auth" with "authority"
so that the generated values match up with functions in the
database.
Signed-off-by: Srey Seng <sreyseng@gmail.com> Signed-off-by: Bill Erickson <berick@esilibrary.com>
Chris Sharp [Wed, 8 Jan 2014 19:51:59 +0000 (14:51 -0500)]
fix pub date data type in reporter.classic_item_list
As noticed by Ben Shum in IRC, reporter.classic_item_list
had pub_date, a free text field, classified as "int". This
changes that to "text" to prevent errors.
Signed-off-by: Chris Sharp <csharp@georgialibraries.org> Signed-off-by: Ben Shum <bshum@biblio.org>
Steven Callender [Thu, 12 Dec 2013 20:13:57 +0000 (15:13 -0500)]
Updated the label on the desk renewal global setting.
Updated the label on the desk renewal global flag circ.desk_renewal.use_original_circ_lib
to properly explain the it's the workstation library that will not be used rather than the
user home library. The OPAC renewal uses the users home library and desk renewals use
the workstation library.
Signed-off-by: Steven Callender <stevecallender@esilibrary.com> Signed-off-by: Ben Shum <bshum@biblio.org>
Galen Charlton [Mon, 25 Nov 2013 18:05:21 +0000 (10:05 -0800)]
LP#1254816: prevent cases where a Google Book preview is not displayed
Due to quirks in how different parts of the Google Books API
processes ISBN searches, it is possible for a Google Books Preview
badge to get displayed, but when the user tries to display the preview,
the embedded preview does not get displayed.
This patch fixes the problem by grabbing the preview link from
the GB volumes search results, which in turn can be fed into the
Embedded Viewer initialization.
An ISBN that can be used to reproduce the problem is 9781937994198.
Before the patch, the badge is displayed but not the preview; after
the patch, both badge and preview should be displayed.
Signed-off-by: Galen Charlton <gmc@esilibrary.com> Signed-off-by: Mike Rylander <mrylander@gmail.com>
Angela Kilsdonk [Tue, 10 Dec 2013 19:30:28 +0000 (14:30 -0500)]
New documentation for 2.5
Documentation for:
-Z39.50 Search Enhancements
-Catalog Browse
-Alternative Hold Pick-up Location
-Marking Items Long Overdue
-Lost and Long Overdue Bill Colors
-Vandelay Item Load
Steven Chan [Wed, 15 May 2013 21:30:15 +0000 (14:30 -0700)]
Fix LP1180140, View Holds not working for a serial with subscription and no issuances
A request is made to
open-ils.circ.holds.retrieve_all_from_title,
which is the function Circ/Holds.pm/all_rec_holds().
In the function, when checking for issuance holds, there is a missing @
to dereference the list of issuance IDs, so that the ahr table is search
with badly formed input, which results in returning an undefined list
instead of an empty list. The error will occur for any record with a
serial.subscription entry but with no related entries in
serial.issuance.
We also recode the initialization of the response object in order to
clarify its expected structure, a hash of array references.
Signed-off-by: Steven Chan <schan@sitka.bclibraries.ca> Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Remington Steed [Thu, 21 Nov 2013 15:29:22 +0000 (10:29 -0500)]
Docs: integrate holds docs from EG 2.1
The small amount of Holds docs present in master seemed to fit well at
the end of the older Holds documentation, so this commit appends them
to the new holds.txt file, deletes the previous holds_management.txt file,
and makes the appropriate change to root.txt.
This commit also includes several small formatting improvements, wording
changes, and bug fixes.
Mike Rylander [Wed, 13 Nov 2013 23:15:21 +0000 (18:15 -0500)]
Fix boolean lists; Better atom regex; Caching
First, we didn't need to make $last_type local, and it broke explicit
grouping anyway. That's removed, and we now reset that (and a few more
like it) at calls to the top level parse() method. This introduces a
situation where a long list of booleans could cause query plan problems,
so we limit the plan depth to 40 (20 ||'d conditions).
Second, we are smarter about finding the boundary of atoms. Previous
to this commit, and curly brace could send the parser into a tailspin
from which it would not recover. Now we use alternation instead of
a character class, which is much safer with the default multi-character
float syntax specifier.
Third, as a catch-all, if we can't parse the remained of a query we
now simply say so (when in debug mode) and go away, instead of risking
an infinite loop. We do this via a final, unqualified "else" clause
in decompose().
Finally, instead of building 10+ regexp objects on each query parse,
cache them per QP subclass and reuse them.
Signed-off-by: Mike Rylander <mrylander@gmail.com> Signed-off-by: Dan Wells <dbw2@calvin.edu>
Bill Erickson [Mon, 28 Oct 2013 14:24:37 +0000 (10:24 -0400)]
LP#1238015 hide patron credit summary when disabled
When the circ.disable_patron_credit / "Disable Patron Credit" org unit
setting is disabled, also hide the patron credit summary information in
the bills interface.
Signed-off-by: Bill Erickson <berick@esilibrary.com> Signed-off-by: Dan Wells <dbw2@calvin.edu>
Mike Rylander [Mon, 25 Nov 2013 15:14:08 +0000 (10:14 -0500)]
Re-apply the changes provided by 0802 for backport
Preserve record order of subfields for authority heading extraction
When extracting headings from authority records we currently read the
subfields of a tag in configuration order. We should, instead, read
them in record order, to preserve the desired sorting properties that
the cataloger has encoded in the record.
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Bill Erickson [Fri, 22 Nov 2013 19:55:26 +0000 (14:55 -0500)]
LP#1254146 gracefully handle custom trees sans entries
Avoid references to custom tree entries when no tree entries for a
custom tree exist. Prevents:
egweb: template error: undef error - Can't call method "org_unit" on an
undefined value at
/usr/local/share/perl/5.10.1/OpenILS/WWW/EGCatLoader/Util.pm line 185.\n
Signed-off-by: Bill Erickson <berick@esilibrary.com> Signed-off-by: Ben Shum <bshum@biblio.org>
Dan Wells [Thu, 14 Nov 2013 20:12:46 +0000 (15:12 -0500)]
Improve facet styling
1) Facets currently display very poorly when the number reaches 3-4
digits. Facet data is more or less a two column table, so let's style
it that way to make it more robust.
2) Rearrange some styles to reduce redundancy, and allow overflow
where possible.
3) Change the selected highlight to look a little better.
Signed-off-by: Dan Wells <dbw2@calvin.edu> Signed-off-by: Ben Shum <bshum@biblio.org>
Mike Rylander [Fri, 15 Nov 2013 21:40:36 +0000 (16:40 -0500)]
Enforce one-payment-per-xact-per-call
There is no legitimate reason for a transaction to receive more than
one payment per call to open-ils.circ open-ils.circ.money.payment,
but we have seen the staff client generate such a data structure. This
leads to seemingly duplicate payments, and is bad all around. So,
we will enforce the restriction by taking only the first payment per
xact in the list of payments.
Signed-off-by: Mike Rylander <mrylander@gmail.com> Signed-off-by: Bill Erickson <berick@esilibrary.com>
Replace erroneous calls to $e->retrieve_authority_record($rec_id).
On lines 153 and 175 of OpenILS::Application::Cat::Authority calls
like the above should be $e->retrieve_authority_record_entry($rec_id).
This branch replaces the two misspelled calls with the proper ones.
Signed-off-by: Jason Stephenson <jstephenson@mvlc.org> Signed-off-by: Mike Rylander <mrylander@gmail.com>
Liam Whalen [Mon, 7 Oct 2013 05:11:56 +0000 (22:11 -0700)]
LP#1037171 Removed Expert Search paramters from subject links
After performing an Expert Search, if a user visits a record and then
clicks on one of the author, subject, or series search links within that
record, then they are given the results of the Expert Search again
instead of the relevant subject or author search.
This is happening because the Expert Search parameters are retained in
the URLs via the TT2 MACRO mkurl. In particular, the tag parameter is
used to identify an Expert Search, so if it is present in a URL, than an
Expert Search will be attempted regardless of which other paramaters are
in the URL.
To fix this, I created two varialbes within header.tt2 above the
definition of mkurl. These variables group common URL paramters for
Expert Searches and General Search parameters together. These variables
can be used wherever mkurl is used to strip out unneeded search
paramters.
There is a third variable that is already present within many of these
pages named stop_parms. While I initially tried to modify this
variable, I found that there are some instances where the general search
parameters should be retained while the Expert Search parameters must go.
This commit uses these three variables togehter as input into the third
arugment of the mkurl MACRO. The third arugment specifies which
paramtes to remove from the previous URL before making a new URL based
on the pervious URL.
I also added the query parameter to the Place Hold's hold_source_page
URL variable. I did this, so that the query terms would be preserved
once the user is done placing the hold or decides to cancle the placing
of the hold.
As well, I used the new variables to remove Expert Search paramters
from the Advanced Search links on the results and record pages.
Conflicts:
Open-ILS/src/templates/opac/parts/searchbar.tt2
Signed-off-by: Liam Whalen <whalen.ld@gmail.com> Signed-off-by: Mike Rylander <mrylander@gmail.com>
Remington Steed [Mon, 18 Nov 2013 20:42:36 +0000 (15:42 -0500)]
Docs: Remove ref to missing included file
This file was moved into the 2.5 release notes. If others believe it
belongs in the main documentation, it can easily be added in again. For
now, we will remove the reference because it only generates an asciidoc
warning.
Remington Steed [Mon, 18 Nov 2013 20:21:09 +0000 (15:21 -0500)]
Docs: Fix leveloffset bug, raise REL NOTES level
We should restrict our use of the asciidoc leveloffset command to the
root.txt file, since it is a global setting and cannot be set relative
to an existing offset.
This commit also raises the Release Notes section to the highest level
in order to prevent the lowest level subsections within it from being
lost. This is in response to asciidoc errors:
WARNING: RELEASE_NOTES_2_5.txt: line 950: missing section: [sect5]
Steven Callender [Thu, 14 Nov 2013 20:42:12 +0000 (15:42 -0500)]
LP1251424 - Fix for submit button when placing holds in staff client
I've moved the initializing of the cur_hold_barcode variable
to within the function rather than floating outside of it.
This seemed to fix an intermittent issue where the submit
button would not become activatable when first going to the
place hold screen via the staff client. To create the hold,
ths user had to cycle through the "Place hold by patron barcode"
option and then back to "Place hold for me" option.
It looked like behind the scenes for certain org units that
variable would not be set and the button will not open until
it at least has something. This causes it to be set on the initial
loading of the screen.
Signed-off-by: Steven Callender <stevecallender@esilibrary.com> Signed-off-by: Ben Shum <bshum@biblio.org>
Added a definition to the HOLD_ITEM_CHECKED_OUT event in ils_events.xml.
Trying to be generic between the opac and the staff client the message
reads, "The item you have attempted to place on hold is already checked
out to the requestor."
[LFW: I made a tiny spelling change to be consistent with other
appearances in Evergreen of the term "requestor".]
projects / Evergreen.git / log