[koha-commits] main Koha release repository branch master updated. v3.20.00-79-g8e726e3
Git repo owner
gitmaster at git.koha-community.org
Thu Jun 4 15:14:39 CEST 2015
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".
The branch, master has been updated
via 8e726e3ee1e519d138074a986c27a2c393e23701 (commit)
via 85a057bc5e1ff5b70bfe6a332e197a51af60bcee (commit)
via cfacda2bb40d5a13af57d62f2df1cda6bcd9a524 (commit)
via 511587395f7ee2daf223c2d5b902d71abbf3fca8 (commit)
via ece2b02a57fdb692c02f00540df436af1f5ba971 (commit)
via 0fa0297d7da7af6a9f4cd82b34ac86018391289f (commit)
via 04f5e7d4e7db833c18afe27a4dc4fd5b66b41099 (commit)
via 61d9cb28dc7caa33d853dbe37ef6b601a8318aa0 (commit)
via 3b4c4a486133882d435369c264dc7b74b5e769f6 (commit)
via 1651cf70d10101739e3a7ff943fb709cedf6dccf (commit)
via 8f12796633e71b9c1e8442cdeba2f7333e71ca52 (commit)
via b59b9919777444c45e0b8ec4af5cf61dd3f5fa45 (commit)
from e46d55409c5e8f6198bb615fbd8e86e3c8d9ea1c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 8e726e3ee1e519d138074a986c27a2c393e23701
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Mon May 4 20:37:58 2015 -0400
Bug 14111 - More t/Auth_with_shibboleth.t silencing
TEST PLAN
---------
1) Apply first patch
2) prove t/Auth_with_shibboleth.t
-- failed?!
3) apply this patch
4) prove t/Auth_with_shibboleth.t
-- success. *whew*
5) koha-qa test tools.
Signed-off-by: Indranil Das Gupta (L2C2 Technologies) <indradg at gmail.com>
Test remarks: Expected outcome as per test plan. No anomaly noted.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 85a057bc5e1ff5b70bfe6a332e197a51af60bcee
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Fri May 1 15:14:49 2015 -0400
Bug 14111: Silence warnings in t/Auth_with_shibboleth.t
Poorly capturing warnings_exist test cases generated noise.
This patch fixes that.
TEST PLAN
---------
1) $ prove t/Auth_with_shibboleth.t
-- There are messages about lines 132 and 133. Noise.
2) Apply patch
3) $ prove t/Auth_with_shibboleth.t
-- No messages. YAY!
4) koha qa test tools
Signed-off-by: Indranil Das Gupta (L2C2 Technologies) <indradg at gmail.com>
Test remarks: Expected outcome as per test plan. No anomaly noted.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit cfacda2bb40d5a13af57d62f2df1cda6bcd9a524
Author: Winona Salesky <wsalesky at gmail.com>
Date: Tue Apr 21 22:49:57 2015 -0400
Bug 13382 - RDA: 700/710/711 display in XSLT
Test Plan:
1) Apply this patch
2) Ensure you are using the default XSLT setting for the staff and opac record details
3) Find or create a record with MARC tags 700,710,711
4) Perform an opac search that would show the record in the search results.
5) Click title to review record.
6) Note the fields updates 700,710,711 to show subfields a, b, c, d, e, f, g, h, i, k, l, m, n, o, p, r, s, t, u, x. Multiple fields are separated by span class=separator |. Adds Related and Contained Works as new headings.
7) Repeat steps 4 - 6 for the staff interface
Signed-off-by: Nick Clemens <nick at quecheelibrary.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 511587395f7ee2daf223c2d5b902d71abbf3fca8
Author: Robin Sheat <robin at catalyst.net.nz>
Date: Tue Jun 2 13:12:51 2015 +1200
Bug 14312: dependency updates
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit ece2b02a57fdb692c02f00540df436af1f5ba971
Author: Jonathan Druart <jonathan.druart at koha-community.org>
Date: Sun May 24 18:00:57 2015 +0200
Bug 14263: Fix export of item search results when translated
This csv does not use the correct way to display headers.
They should be put in a separate file to get a correct display.
Without this patch, the first line of the generated file contains the
headers + data
Test plan:
1/ choose a language and update + translate the templates
for instance:
cd misc/translate;
./translate update es-ES; ./translate install es-ES
2/ Go to the item search form using this language
3/ Launch a search and select CSV to display the results.
The CSV headers should be correct
Signed-off-by: Frederic Demians <f.demians at tamil.fr>
Seen the bug. Works as described.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 0fa0297d7da7af6a9f4cd82b34ac86018391289f
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Tue Apr 28 12:52:36 2015 +0200
Bug 12320: Remove deprecated construct to delete cookie showColumns
$.cookie('foo', null);
is deprecated and should be replaced with
$.removeCookie('foo');
This patch replaces the occurrences for the "showColumns" cookie.
Before this patch, there was a bug on the batchmod tools.
To reproduce the issue:
1/ Go on the Batch item modification tool
2/ Fill the textarea with barcodes and submit
3/ Click on some column names (to create the cookie)
4/ Click on 'Show all columns" (to set the cookie to null)
5/ Don't submit and repeat steps 1 & 2
6/ You should see a js error:
Error: Syntax error, unrecognized expression: :nth-child
...break;q=a}return s},m.error=function(a){throw new Error("Syntax error, unrecogni...
Test plan:
Confirm the issue has gone away and there is no regression on the column
selection
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
No js error, no regressions, no errors
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 04f5e7d4e7db833c18afe27a4dc4fd5b66b41099
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Tue Apr 28 12:52:00 2015 +0200
Bug 12320: Remove deprecated construct to delete cookie holdfor
$.cookie('foo', null);
is deprecated and should be replaced with
$.removeCookie('foo');
This patch replaces the occurrences for the "holdfor" cookie.
Test plan:
1/ Search for a patron
2/ On the patron detail page, click on "search to hold"
3/ Search for records
4/ On the results page, click on "Place hold" > "Forget PATRON"
5/ Reload the page.
6/ The "Place hold" button should not contain the patron anymore
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Works as described, no errors
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 61d9cb28dc7caa33d853dbe37ef6b601a8318aa0
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Thu Jun 4 10:05:48 2015 -0300
Bug 5010: DBRev 3.21.00.004
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 3b4c4a486133882d435369c264dc7b74b5e769f6
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Wed Apr 29 12:59:23 2015 +0200
Bug 5010: Fix - replace tab with spaces
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
No errors.
Tested what I can, not plack/shibboleth/cas
Perhaps this can pass and we can fix any problem later (for 3.22)
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 1651cf70d10101739e3a7ff943fb709cedf6dccf
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Wed Feb 11 15:26:13 2015 +0000
Bug 5010: Fix OPACBaseURL to include protocol
First, it is strongly recommended to set the OPACBaseURL. But
this patch allows the inclusion of the protocol and not just
a site.
Next, C4/Auth now puts OPACBaseURL into the template parameters
regardless of OPAC or Staff clients. t/db_dependent/Auth.t was
tweaked to add a check for confirming that get_template_and_user
adds OPACBaseURL to both OPAC and Staff templates.
In the staff client, once the OPACBaseURL is set, you get a nice
OPAC View link when viewing a biblio's detail. It should reflect
the protocol used now.
Hard coded 'http://' strings were removed from the
sample_notices.sql files. This is what required also updating
the letters table in the updatedatabase.pl script.
The explanation text in the sysprefs.sql needed updating too to
reflect the inclusion of the protocol. And this was the other
update done in the updatedatabase.pl script. The opac.pref file
was similarly changed as well.
catalogue/detail.pl had no need to pass a custom OpacUrl value,
since C4/Auth passes the required OPACBaseURL, so it and the
corresponding template were modified.
Both the MARC21 and NORMARC intranet details files had 'http://'
hard coded in them. This was removed.
Both the bootstrap and prog theme opac-detail template had a
protocol parameter that was used. The logic for the parameter
was not removed, because it is used extensively in one template.
Perhaps it should be used to simplify the other. However, the
calculated current_url parameter had references to the protocol
removed, because of the changes to OPACBaseURL.
opac/opac-shareshelf.pl had a hard coded 'http://' which was
removed.
t/db_dependent/Auth_with_cas.t had 'http://' added to the value
set for OPACBaseURL.
In virtualshelves/sendshelf.pl explicit code which sent the
OPACBaseURL preference was removed, since C4/Auth sends it all
the time now.
C4::Context::set_preference was tweaked to ensure that
OPACBaseURL would always start with http.
t/db_dependent/Context.t was tweaked to specifically test this.
The Shibboleth authentication needs OPACBaseURL set, and that
it be https protocol. The _get_uri routine was tweaked to always
pass back https:// as the protocol on the OPACBaseURL.
t/Auth_with_shibboleth.t was tweaked to specifically test the
changes.
TEST PLAN
---------
This is not an easy patch to test. Difficulties include:
- configuring Koha to run under https
(tweaking apache2 isn't so hard, just tricky)
- configuring Koha to run OPAC and Staff with Plak
(since code with comments about plak were sliced out)
- configuring Koha to use CAS
(may be requires for the CAS test)
1) Apply patch
2) Make sure OPACBaseURL is set without the protocol included.
UPDATEDATABASE
3) back up your DB
4) ./installer/data/mysql/updatedatabase.pl
-- It should run without errors.
5) Look up the OPACBaseURL system preference in the staff
client
-- It should have http:// prepended.
6) Run the mysqlclient from your koha git directory
USE koha_library;
SELECT content FROM letter WHERE content LIKE "%<<OPACBaseURL>>%";
-- There should be no prepended http:// on the
<<OPACBaseURL>>.
7) restore your DB
8) Make sure OPACBaseURL is set with the protocol included,
preferably https.
-- Using https requires a bunch of apache2 tweaks.
AUTH
9) Call up staff client.
10) Call up OPAC.
-- C4/Auth.pm doesn't barf.
11) Call up Plack staff client
12) Call up Plack OPAC.
-- C4/Auth.pm doesn't barf.
13) prove -v t/db_dependent/Auth.t
CONTEXT
14) Home -> Koha administration -> Global System Preferences
-> OPAC
15) Modify and save OPACBaseURL to not have http:// or https://
on it.
-- It should be modified to include http://
16) Modify and save another system preference.
-- It should save normally
17) prove -v t/db_dependent/Context.t
CATALOGUE/DETAIL (tt & pl)
18) Confirm the OPACBaseURL is set
19) Navigate to any biblio details in the staff client
-- There should be a "OPAC view" link which has the
correct http:// or https:// in it.
SQL (sample notices and sysprefs)
20) Run the mysqlclient from your koha git directory
USE koha_library;
DELETE FROM letter;
source installer/data/mysql/de-DE/mandatory/sample_notices.sql;
SELECT content FROM letter WHERE content LIKE "%<<OPACBaseURL>>%";
DELETE FROM letter;
source installer/data/mysql/en/mandatory/sample_notices.sql;
SELECT content FROM letter WHERE content LIKE "%<<OPACBaseURL>>%";
DELETE FROM letter;
source installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices.sql;
SELECT content FROM letter WHERE content LIKE "%<<OPACBaseURL>>%";
DELETE FROM letter;
source installer/data/mysql/es-ES/mandatory/sample_notices.sql;
SELECT content FROM letter WHERE content LIKE "%<<OPACBaseURL>>%";
DELETE FROM letter;
source installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql;
SELECT content FROM letter WHERE content LIKE "%<<OPACBaseURL>>%";
DELETE FROM letter;
source installer/data/mysql/it-IT/necessari/notices.sql;
SELECT content FROM letter WHERE content LIKE "%<<OPACBaseURL>>%";
DELETE FROM letter;
source installer/data/mysql/pl-PL/mandatory/sample_notices.sql;
SELECT content FROM letter WHERE content LIKE "%<<OPACBaseURL>>%";
DELETE FROM letter;
source installer/data/mysql/ru-RU/mandatory/sample_notices.sql;
SELECT content FROM letter WHERE content LIKE "%<<OPACBaseURL>>%";
DELETE FROM letter;
source installer/data/mysql/uk-UA/mandatory/sample_notices.sql;
SELECT content FROM letter WHERE content LIKE "%<<OPACBaseURL>>%";
-- Each of the selects should should lines that have
<<OPACBaseURL>> starting them, but no hard-coded http://
DELETE FROM systempreferences;
source installer/data/mysql/sysprefs.sql;
SELECT * FROM systempreferences WHERE variable='OPACBaseURL';
-- The explanation should reflect the new explanation.
QUIT
21) restore your DB
22) Make sure OPACBaseURL is set with the protocol included,
preferably https.
-- Using https requires a bunch of apache2 tweaks.
SLIM2INTRANETDETAIL
23) Set 'XSLTDetailsDisplay' system preference to default.
24) Set 'marcflavour' system preference to MARC21.
25) View any biblio's details.
-- the URL beside 'OPAC View' should have the appropriate
http:// or https://
26) Set 'marcflavour' system preference to NORMARC.
27) View any biblio's details.
-- the URL beside 'OPAC View' should have the appropriate
http:// or https://
OPAC-DETAIL
28) Set 'opacthemes' to bootstrap.
29) Set 'SocialNetworks' to enabled.
30) In OPAC, view any biblio's details.
-- the Share links should have the appropriate protocol on
the OPACBaseURL.
31) Set 'opacthemes' to prog.
32) In OPAC, view any biblio's details.
-- the Share links should have the appropriate protocol on
the OPACBaseURL.
AUTH_WITH_CAS
33) prove -v t/db_dependent/Auth_with_cas.t
OPAC-SHARESHELF
34) Set 'OpacAllowSharingPrivateLists' to allow.
35) In OPAC, 'Save to Lists' a search result.
36) Save it to a new private list.
37) Click the Lists button, and select the new list.
38) Click the Share button.
AUTH_WITH_SHIBBOLETH
39) prove -v t/Auth_with_shibboleth.t
-- needs to be tests on Debian, because I can't get
the Test::DBIx::Class installed in Ubuntu. :(
Rebased again on kohadevbox...
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 8f12796633e71b9c1e8442cdeba2f7333e71ca52
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Wed Jun 3 15:25:47 2015 -0400
Bug 14325: Test calls C4::Context::set_userenv
This is a case of works by accident. This patch corrects the
set_userenv call.
TEST PLAN
---------
1) prove t/db_dependent/Borrower_Discharge.t
-- works
2) git grep :set_userenv
-- only this one file.
3) Confirm the the C4/Context.pm has a set_userenv
which shifts the first parameter, as intended for
a -> call and not a :: call.
4) apply patch
5) prove t/db_dependent/Borrower_Discharge.t
-- still works
6) git grep :set_userenv
-- nothing now.
7) run koha qa test tools
Signed-off-by: Indranil Das Gupta (L2C2 Technologies) <indradg at gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit b59b9919777444c45e0b8ec4af5cf61dd3f5fa45
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Wed May 27 15:31:58 2015 -0300
Bug 14283: Required Devel::Cover should be Wheezy's
There's no special requirement for such a recent version of the
Devel::Cover package.
We have just deprecated Squeeze, so Wheezy's version should be ok.
Signed-off-by: Robin Sheat <robin at catalyst.net.nz>
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Auth.pm | 7 +-
C4/Auth_with_shibboleth.pm | 16 +-
C4/Context.pm | 5 +
C4/Installer/PerlDependencies.pm | 2 +-
Koha.pm | 2 +-
catalogue/detail.pl | 6 -
catalogue/itemsearch.pl | 5 +-
debian/control | 2 +
.../data/mysql/de-DE/mandatory/sample_notices.sql | 2 +-
.../data/mysql/en/mandatory/sample_notices.sql | 2 +-
.../data/mysql/es-ES/mandatory/sample_notices.sql | 2 +-
.../mysql/fr-FR/1-Obligatoire/sample_notices.sql | 2 +-
installer/data/mysql/it-IT/necessari/notices.sql | 2 +-
.../mysql/nb-NO/1-Obligatorisk/sample_notices.sql | 2 +-
.../data/mysql/pl-PL/mandatory/sample_notices.sql | 2 +-
.../data/mysql/ru-RU/mandatory/sample_notices.sql | 2 +-
installer/data/mysql/sysprefs.sql | 2 +-
.../data/mysql/uk-UA/mandatory/sample_notices.sql | 2 +-
installer/data/mysql/updatedatabase.pl | 23 +++
.../en/includes/catalogue/itemsearch_item.csv.inc | 2 +-
.../csv_headers/catalogue/itemsearch.tt} | 3 -
.../intranet-tmpl/prog/en/js/pages/batchMod.js | 10 +-
koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js | 2 +-
.../prog/en/modules/admin/preferences/opac.pref | 4 +-
.../prog/en/modules/catalogue/detail.tt | 10 +-
.../prog/en/modules/catalogue/itemsearch.csv.tt | 2 +-
.../prog/en/modules/catalogue/results.tt | 2 +-
.../prog/en/modules/circ/circulation.tt | 9 +-
.../prog/en/xslt/MARC21slim2intranetDetail.xsl | 147 ++++++++++++++--
.../prog/en/xslt/NORMARCslim2intranetDetail.xsl | 2 +-
.../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 10 +-
.../bootstrap/en/xslt/MARC21slim2OPACDetail.xsl | 175 +++++++++++++++++---
opac/opac-shareshelf.pl | 3 +-
t/Auth_with_shibboleth.t | 30 +++-
t/db_dependent/Auth.t | 30 +++-
t/db_dependent/Auth_with_cas.t | 2 +-
t/db_dependent/Borrower_Discharge.t | 2 +-
t/db_dependent/Context.t | 28 +++-
virtualshelves/sendshelf.pl | 5 -
39 files changed, 463 insertions(+), 103 deletions(-)
copy koha-tmpl/intranet-tmpl/prog/en/{modules/catalogue/itemsearch.csv.tt => includes/csv_headers/catalogue/itemsearch.tt} (59%)
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/empty_line.inc
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list