evergreen:tags/rel_2_2_2

Last commit made on 2012-08-22
Get this branch:
git clone -b tags/rel_2_2_2 https://git.launchpad.net/evergreen

Branch merges

Branch information

Name:
tags/rel_2_2_2
Repository:
lp:evergreen

Recent commits

91f7333... by Lebbeous Fogle-Weekley <email address hidden>

Bumping version numbers, adding Upgrade Script and Changelog

Signed-off-by: Lebbeous Fogle-Weekley <email address hidden>

b69c3b2... by Lebbeous Fogle-Weekley <email address hidden>

Documentation: 2.2.2 release notes; adjust upgrade instructions for 2.2.2

Signed-off-by: Lebbeous Fogle-Weekley <email address hidden>

7a120b1... by Bill Erickson

Sanity check cstore limit/offset param values

Certain cstore calls (direct / json_query) that support limit/offset
params called with a non-string / non-numeric value

e.g. { "limit": null }

result in a cstore segfault as it tries to call atoi(NULL) under the
covers. This patch prevents this by verifying that the limit/offset
values are actual strings or numbers (i.e. return a value from
jsonObjectGetString) and not JSON_NULL, etc.

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

53cbfd2... by Dan Scott <email address hidden>

Protect against installs with no locales

Installs from source outside of tarballs may not have a built locale,
which would result in a make error and an aborted install. Protect
against that by checking for the existence of the locale install
directory before trying to copy the files into place.

In the weird case that Open-ILS/src/data/locale has been generated but
there are no files in it, protect against erroring out via the judicious
application of the - flag.

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

e033780... by Dan Scott <email address hidden>

TPAC: Standardize i18n file installation

Make TPAC i18n files act like any other i18n file. In short:

1. When in build/i18n, a 'make LOCALE=fr-CA install' will copy
   the i18n file into the Open-ILS/src/data/locale directory.
2. In the build root, a 'make install' will copy all files from
   Open-ILS/src/data/locale into (by default) the
   /openils/var/data/locale directory.

This also means that when tarballs are created, all of the locales will
get packaged appropriately.

This commit also updates eg_vhost.conf to provide working out-of-the-box
examples for any installed locales, by using the names of the actual
PO files, and adds some contextual comments to explain how the
configuration directives work.

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

a575bb9... by Dan Scott <email address hidden>

TPAC: Autosuggest focus() throws a JS error

On page load, the Dojo autosuggest code tries to set focus to the
element with the ID "search_box" - which is fine, except when the page
does not have said ID. Therefore, test for the existence of the ID
before setting focus to it.

Signed-off-by: Dan Scott <email address hidden>
Signed-off-by: Art Rhyno <email address hidden>

a907bc5... by Dan Scott <email address hidden>

TPAC locale picker: use POST instead of GET

Users could (deliberately or not) change another's language
preferences by sharing links with the "set_eg_locale" GET param given
the locale picker's current behaviour. By switching to a POST param, we
prevent this result from accidentally occurring.

Signed-off-by: Dan Scott <email address hidden>
Signed-off-by: Art Rhyno <email address hidden>

cc38fdc... by Mike Rylander

Stamping upgrade script for copy editor field hiding permission

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

Conflicts:
 Open-ILS/src/sql/Pg/002.schema.config.sql

1b6f161... by Thomas Berezansky

Update permission name to match existing ones

To be consistent with our previous naming scheme for these.

Signed-off-by: Thomas Berezansky <email address hidden>
Signed-off-by: Mike Rylander <email address hidden>

Conflicts:
 Open-ILS/src/sql/Pg/950.data.seed-values.sql

89f3acd... by Mike Rylander

Provide permission for copy editor field hiding

We can adjust what fields are available in the copy editor in 2.2+, but that
requires the general UPDATE_ORG_SETTING permission. The YAOUS-specific
permission here allows more granular control, so that staff can be given the
ability to adjust only that one OU setting.

Signed-off-by: Mike Rylander <email address hidden>
Signed-off-by: Thomas Berezansky <email address hidden>

Conflicts:
 Open-ILS/src/sql/Pg/950.data.seed-values.sql