evergreen:rel_3_2

Last commit made on 2019-08-19
Get this branch:
git clone -b rel_3_2 https://git.launchpad.net/evergreen

Branch merges

Branch information

Name:
rel_3_2
Repository:
lp:evergreen

Recent commits

6fe5ace... by Mike Risher on 2019-07-10

lp1739292 merge UI displays record summary

Add the record summary to the record merge UI. Note that when one clicks
on "use as lead record" or "remove from consieration" the order of the
records changes. The record summary also will change order to match.

Signed-off-by: Mike Risher <email address hidden>

 Changes to be committed:
 modified: Open-ILS/src/templates/staff/cat/bucket/record/t_merge_records.tt2
 new file: Open-ILS/src/templates/staff/cat/share/t_record_summary_slim.tt2
 modified: Open-ILS/web/js/ui/default/staff/cat/services/record.js

Signed-off-by: Bill Erickson <email address hidden>

c58e274... by James Fournie <email address hidden> on 2019-05-02

LP1751800 - fix fields fields reversing

The pop() here will remove the last item in the array, only to add it
later with a push() a few lines later. Instead use a shift() to
preserve the order.

Signed-off-by: James Fournie <email address hidden>
Signed-off-by: Remington Steed <email address hidden>
Signed-off-by: Dan Wells <email address hidden>

67a7e6c... by Galen Charlton on 2019-05-22

LP#1785061: move the filter value munging to the template service

This allows the reporter app to stay a bit more focused on
display concerns.

Here's a test plan for the patch series
---------------------------------------
[1] Create a reporter template that has a filter field
    and a filter operator of "In list", "Not in list", "Between",
    or "Not between" and hard-code a value for that filter
    in the template, separating values with a comma.
[2] Try to create a report from that template; note that it
    fails with an error.
[3] Apply the patch and repeat steps 1 and 2. This time, the
    report should succeed.

Note that this fix applies only to hardcoding filter values in the
template; it doesn't change any behavior when attempting to set
a filter value for any of the four operators above at the point of
creating a report.

Signed-off-by: Galen Charlton <email address hidden>

Conflicts:
 Open-ILS/web/js/ui/default/staff/reporter/template/app.js

Signed-off-by: Dan Wells <email address hidden>

e9d696e... by Remington Steed on 2019-05-02

LP#1785061: Split filter value on comma for "in list" and the like

This commit borrows directly from the XUL reporter code (see
function __default_value_event_handler () in
Open-ILS/web/reports/xul/template-config.js). Basically, when the filter
value is saved, certain cases need special treatment, such as splitting
an "in list" value on commas. This commit includes a helper function
which does the special treatment and saves the filter value. This helper
is called both when the value itself is changed, and when the operator
is changed.

Signed-off-by: Remington Steed <email address hidden>
Signed-off-by: Galen Charlton <email address hidden>

Conflicts:
 Open-ILS/web/js/ui/default/staff/reporter/template/app.js

Signed-off-by: Dan Wells <email address hidden>

3cc7e28... by Jane Sandberg on 2018-11-10

LP1735768: adding labels to inputs in the public catalog

Signed-off-by: Jane Sandberg <email address hidden>
Signed-off-by: Galen Charlton <email address hidden>

334e8b9... by Galen Charlton on 2019-08-06

LP#1722827: stamp DB update

Signed-off-by: Galen Charlton <email address hidden>

261e0a6... by Rogan Hamby on 2018-09-14

LP#1722827: trim spaces from 856$9 when parsing locating URIs

This patch ensures that any leading and trailing spaces
and non-breaking-spaces in the 856$9 are ignored when
extracting the org unit shortname. As a consequence,
extraneous leading/trailing whitespace in the $9 will not
prevent the located URI from being displayed in the appropriate
places.

Signed-off-by: Rogan Hamby <email address hidden>
Signed-off-by: Meg Stroup <email address hidden>
Signed-off-by: Galen Charlton <email address hidden>

28f4db9... by Michele Morgan on 2018-05-23

LP#1511765 Fix error when checking in with zero-balance lost OU setting enabled

Fixes an error generated when checking in Lost/Long Overdue/Lost and Paid
items with no associated circ when the org unit setting
circ.checkin.lost_zero_balance.do_not_change is set to TRUE

Items can attain this state from migration, or when the associated circ
has been aged.

Signed-off-by: Michele Morgan <email address hidden>
Signed-off-by: Kyle Huckins <email address hidden>
Signed-off-by: Galen Charlton <email address hidden>

119ac1f... by Jane Sandberg on 2019-07-29

LP1802593: Correct formatting of language code in Angularjs, KPAC

EgWeb offers two different formats of the current locale: ctx.locale and
ctx.eg_locale. This commit configures the lang attribute in AngularJS
staff client, OPAC, and KPAC to use eg_locale, since it has the
appropriate format (e.g. en-US, fr-CA).

Also adds some tests for EgWeb's handling of language codes.

Signed-off-by: Jane Sandberg <email address hidden>
Signed-off-by: Galen Charlton <email address hidden>

0c1b298... by Kyle Huckins <email address hidden> on 2019-05-23

lp1034058 Disable Renewal Due Dates in the Past

Apply minimum date and an out of range flag to prevent
selecting or inputting a past date when renewing items from
Circulation->Renew Items or Patron->Items Out->Actions->
Renew With Specific Due Date.

To test
-------
[1] Create a loan.
[2] From the patron's Item Out page, use the Renew With
    Specific Due Date action. Note that the date widget
    will allow you to specify a due date in the past.
[3] From the Circulation -> Renew interface, note that
    the date widget will also let you specify a due
    date in the past.
[4] Apply the patch and repeat steps #2 and #3. This time,
    a due date in the past cannot be entered, both via
    the calendar button and by direct entry in the text
    box.

Signed-off-by: Kyle Huckins <email address hidden>
Signed-off-by: Galen Charlton <email address hidden>
Signed-off-by: Chris Sharp <email address hidden>