[koha-commits] main Koha release repository branch master updated. v17.05.00-483-gd510598
Git repo owner
gitmaster at git.koha-community.org
Wed Aug 30 22:00:33 CEST 2017
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 d51059807690797aa4d16b0c0dd2932235a3b683 (commit)
via 6babeeccabd71c0cd7990847d5c615012740ffdb (commit)
via 9a8a6da3f460b19ba483f944dac962aed2571eca (commit)
via af293fd8867729a9670d19231ca4377093a00438 (commit)
via 79439a02626a6b14558091a958a27cafcefe73e0 (commit)
via 23cc8b39682fea7b0a9150933c65c34ef22d23dd (commit)
via 255cadeb772d63b06f77146c95b8d6e4b31d5836 (commit)
via 331320f93a5ef5293c3bcad80b9554ddea0196b0 (commit)
via c8551645d5bdd3e6fb5b7e03280521a2fbaef636 (commit)
via 9ed4bdc87e92506ba4a51f92cc198f3c5ce282eb (commit)
via ae684fc9491102ba0b560ca6f414a325e763b31a (commit)
via ff591f2c77a2a3c1de4a0e7167ccfeba08c2f128 (commit)
via 752aef4593f1aa2d64700bf9738e7e03907eb1cd (commit)
via 7e39bbc61aedd6383f4d6a1b4728711c6922e877 (commit)
via 03c7f9366c97d6402e1e16182d7a2ddbbe37eccb (commit)
via 25fa02272d16c98d49a6020e867f60bc0510d960 (commit)
via 2ee82801c7a8686523f9c5e95b0f43d44e52e4ab (commit)
via 79338bde3e01708fe331a54745f45c620c121805 (commit)
via 59e95182cf1862095fb307cc08ba2a45d5630c11 (commit)
via bd81047f42164328654b9fb65d21de7ec8532b3b (commit)
via 921e39a7ae123c112a7f09ec4bebf91e20235fec (commit)
via 6719eee83a5232af18693ff8aef71d7464881d03 (commit)
via 60bddbcc96bf92777a5954c2842d36ca55f12d46 (commit)
via 30048f4aabeec27fdf0a4f195f82c822eddab501 (commit)
via e63eee05a09cc0373491cce213e012ffc011b9f3 (commit)
via bc09af634c92dc83f4eb28761bcff428481f6daf (commit)
via 3ecc6fd8c68af0ed410ee2ea77060999993220a7 (commit)
via 1076a0edf32b621da54c53ea71595885f7e14c38 (commit)
via 86e8612c020cea44be123be45f2e503af38ef98b (commit)
via ce2561441c3c6e5bdc5ee7011d250c24a2d49105 (commit)
from 36ba8be88a9543942102580f2b1abe1e5e108c35 (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 d51059807690797aa4d16b0c0dd2932235a3b683
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date: Wed Jun 28 00:40:00 2017 +0000
Bug 18871: Make patron list name a link to view contents of list
The link is the same as the 'Add patrons' button in Actions dropdown,
but requires one less click, and makes finding the contents of the list
more obvious.
To test:
1) Go to Tools -> Patron lists
2) Create a patron list if you haven't already
3) Confirm that clicking the name of the list takes you to the correct
list and shows the expected content.
Sponsored-by: Catalyst IT
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 6babeeccabd71c0cd7990847d5c615012740ffdb
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date: Tue Jun 27 01:59:55 2017 +0000
Bug 18860: Adding thead tags to OPAC messaging settings table
So that it can be styled alongside other tables in the OPAC.
To test:
1) Log into staff side
2) Find OPACUserCSS syspref and add the following CSS:
thead {
color: red;
}
3) Log into the OPAC
4) Go to your fines, your search history, your reading history etc -
notice all of these table's headings are styled with red text
5) Go to your messaging. Notice this table's headings are not styled
with red text
6) Apply patch and refresh page
7) Your messaging table should now have red headings.
(You can delete the CSS from OPACUserCSS if you'd like.)
Sponsored-by: Catalyst IT
Signed-off-by: Jesse Maseto <jesse at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 9a8a6da3f460b19ba483f944dac962aed2571eca
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date: Mon Jul 10 03:39:21 2017 +0000
Bug 18869: [FOLLOW-UP] Show enrollments as disabled link
if club has no enrolled patrons
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit af293fd8867729a9670d19231ca4377093a00438
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date: Sun Jul 9 21:57:06 2017 +0000
Bug 18869: [FOLLOW-UP] Make page reload after club or template delete
If deleting the last club or template in a table, the row is deleted
from the webpage by ajax so the nice blue bubble message does not show.
This patch forces the page to reload so the blue bubble message shows
instead of the empty table.
To test:
Confirm that the blue message shows when tables are empty. Add a
template and a club, then delete a club. Confirm the page reloads and
the message shows. Test with template
Sponsored-by: Catalyst IT
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 79439a02626a6b14558091a958a27cafcefe73e0
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date: Wed Jun 28 02:29:27 2017 +0000
Bug 18869: Fixing display of patron clubs tables
This patch
1) Hides the club templates table if there are no club templates, shows
an appropriate message
2) Hides the clubs table if there are no clubs. Shows an appropriate
message for whether templates exist
3) Puts the actions in one column, or a dropdown menu
Sponsored-by: Catalyst IT
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 23cc8b39682fea7b0a9150933c65c34ef22d23dd
Author: Marc Véron <veron at veron.ch>
Date: Mon Jun 12 09:07:28 2017 +0200
Bug 18781: Translatability: Get rid of exposed tt directives in openlibrary-readapi.inc
The file koha-tmpl/opac-tmpl/bootstrap/en/includes/openlibrary-readapi.inc
exposes template directives to translation. The only string that should
appear in .po from this file is "Open Library: "
To test:
- Apply patch
- Verify that code changes make sense
- Bonus test: create a new language 'aa-AA', verify in aa-AA-opac-bootstrap.po
that there is only the following string for openlibrary-readapi.inc:
msgid "Open Library: "
msgstr ""
NOTE: Followed a test plan similar to bug 18776 comment 3
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 255cadeb772d63b06f77146c95b8d6e4b31d5836
Author: Marc Véron <veron at veron.ch>
Date: Mon Jun 12 08:41:41 2017 +0200
Bug 18780: Translatability: Get rid of exposed tt directive in masthead-langmenu.inc
The file opac-tmpl/bootstrap/en/includes/masthead-langmenu.inc exposes following tt directive to translators:
"[%% IF ( ( opaclanguagesdisplay ) && ( ! one_language_enabled ) && "
"( languages_loop ) && ( OpacLangSelectorMode == 'both' || "
"OpacLangSelectorMode == 'top') ) %%] "
This patch fixes it.
To test:
- Apply patch
- Verify that language selector in OPAC (top of the page) works as expected
- Bonus test: create a new language 'aa-AA', verify that line above does not
show up in aa-AA-opac-bootstrap.po
NOTE: Followed a test plan similar to bug 18776 comment 3
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 331320f93a5ef5293c3bcad80b9554ddea0196b0
Author: Marc Véron <veron at veron.ch>
Date: Mon Jun 12 08:20:56 2017 +0200
Bug 18779: Translatability: Get rid of exposed tt directives in authorities-search-results.inc (OPAC)
The file opac-tmpl/bootstrap/en/includes/authorities-search-results.inc
exposes template directives to translation where translators should not
be confronted with.
Example:
"[%% PROCESS showreference heading=seeals.heading linkType='seealso' "
"type=seeals.type authid=seeals.authid %%] "
To test:
- Apply patch
- Verify that Authority search in OPAC works as before
- Bonus test: create a new language 'aa-AA', verify that line above
does not show up in aa-AA-opac-bootstrap.po
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit c8551645d5bdd3e6fb5b7e03280521a2fbaef636
Author: Marc Véron <veron at veron.ch>
Date: Mon Jun 12 07:48:57 2017 +0200
Bug 18778 - Translatability: Get rid of tt directive in translation for item-status.inc
The file opac-tmpl/bootstrap/en/includes/item-status.inc exposes a template directive where translators should not be confronted with.
"%s %s [%%#- This include takes two parameters: an item structure and an "
"optional loan (issue) structure. The issue structure is used by course "
"reserves pages, which do not use an API to fetch items that populates item."
"datedue. -%%] %s %s %s %s "
This patch fixes new lines inside a tt directive (comment).
It is merely a string patch.
To test:
Verify that the code changes make sense.
(Bonus test: create a new language 'aa-AA', verify that line above does not
show up in aa-AA-opac-bootstrap.po)
NOTE: Followed test plan similar to bug 18776 comment 3.
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 9ed4bdc87e92506ba4a51f92cc198f3c5ce282eb
Author: Marc Véron <veron at veron.ch>
Date: Sun Jun 11 20:16:46 2017 +0200
Bug 18777: Translatability: Get rid of exposed tt directives in opac-memberentry.tt
The file opac-memberentry.tt exposes template directives to translation where
translators should not be confronted with.
Example from po file:
"%s [%% UNLESS hidden.defined('B_address') && hidden.defined('B_address2') && "
"hidden.defined('B_city') && hidden.defined('B_state') && hidden."
"defined('B_zipcode') && hidden.defined('B_country') && hidden."
"defined('B_phone') && hidden.defined('B_email') && hidden."
"defined('contactnote') %%] "
To test:
- Apply patch
- Verify that advanced search in OPAC the page 'your personal details'
behaves as before
- Verify that you can change values and submit an update request
- Create a new translation for a 'language' aa-AA (perl translate create aa-AA)
- Verify that template directives ar no longer exposed in aa-AA-opac-bootstrap.p
NOTE: Followed test plan similar to bug 18776 comment 3.
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit ae684fc9491102ba0b560ca6f414a325e763b31a
Author: Marc Véron <veron at veron.ch>
Date: Sun Jun 11 16:54:28 2017 +0200
Bug 18776: Translatability: Get rid of exposed tt directives in opac-advsearch.tt
The file opac-advsearch.tt exposes template directives to translation where translators should not be confronted with.
Example in po file:
"[%% IF ( ( OpacAdvSearchOptions and OpacAdvSearchOptions.grep('itemtype')."
"size > 0 and not expanded_options ) or ( OpacAdvSearchMoreOptions and "
"OpacAdvSearchMoreOptions.grep('itemtype').size > 0 and expanded_options ) ) "
"%%] "
To test:
- Apply patch
- Verify that advanced search in OPAC behaves as before
- Create a new translation for a 'language' aa-AA (perl translate create aa-AA)
- Verify that template directives ar no longer exposed in aa-AA-opac-bootstrap.po
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit ff591f2c77a2a3c1de4a0e7167ccfeba08c2f128
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Aug 4 16:44:51 2017 +0200
Bug 18754: [QA Follow-up] Tiny corrections
Converted one INCLUDE directive to PROCESS; we are not changing variables here. (The PROCESS directive is slightly faster than INCLUDE because it avoids the need to localise (i.e. copy) the variable stash before processing the template.)
Removed one vim inserted letter i.
Error in [% IF ( XISBN.publicationyear ) _ ', ' _ XISBN.publicationyear %][% END %] The concatenation became part of the condition.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 752aef4593f1aa2d64700bf9738e7e03907eb1cd
Author: Marc Véron <veron at veron.ch>
Date: Fri Jun 9 15:43:36 2017 +0200
Bug 18754: Translatability: Get rid of exposed tt directives in opac-detail.tt
The file opac-detail.tt exposes a lot of template directives to translation where translators should not be confronted with.
Some examples from po file are:
$[% SUBFIELD.code %] [% SUBFIELD.value %]
%s [%% INCLUDE \"openlibrary-readapi.inc\" bib = { normalized_isbn => "
"normalized_isbn, lccn => lccn, normalized_oclc => normalized_oclc } %%]
See: [% IF ( nextTitle ) %][% nextTitle |html %][% ELSE %]next biblio[% END "
"%]
To test:
- Apply patch
- Do a search in OPAC that has more than 1 results
- Go to the detail page of one of the items found
- Verify that the details display as before and that you can
browse the results with Previous and Next
- In staff client, change OPACXSLTDetailsDisplay from 'default' to
empty for "no xslt" and repeat steps above
- In staff client, set HTML5MediaEnabled to 'OPAC' or 'OPAC and staff client'
- Verify that media catalogued in field 856 still work
- Create a new translation for a 'language' aa-AA (perl translate create aa-AA)
- Verify that template directives ar no longer exposed in aa-AA-opac-bootstrap.po
Followed test plan which works as intended
Signed-off-by: Alex Buckley <alexbuckley at catalyst.net.nz>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 7e39bbc61aedd6383f4d6a1b4728711c6922e877
Author: Marc Véron <veron at veron.ch>
Date: Tue May 23 17:09:49 2017 +0200
Bug 18660: Translatability: Get rid of template directives [%% in translation for patroncards-errors.inc
Translation for koha-tmpl/intranet-tmpl/prog/en/includes/patroncards-errors.inc
contains a lot of (partial) template directives like:
%%]%s %sLayout: [%%
This patch fixes it
To test:
- Verify that code changes make sense
- Apply patch
- Create a translation (cd misc/translator , then: perl translate create aa-AA
- Verify that in po/aa-AA-staff-prog.po contains no fragments like %%] or [%%
for patroncards-errors.inc
- Try to get an error: Try a link like
http://[YOUR SERVER]/cgi-bin/koha/patroncards/create-pdf.pl?batch_id=1&template_id=999&layout_id=999&start_card=1
...where template_id and layout_id do not exist
(Amended for comment #2 2017-06-05 mv)
(Amended for comment #6 2017-08-02 mv)
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 03c7f9366c97d6402e1e16182d7a2ddbbe37eccb
Author: Marc Véron <veron at veron.ch>
Date: Sun May 28 09:34:21 2017 +0200
Bug 18687: Translatability: abbr tag should not contain lang attribute
In manage-marc-import.tt, we have an abbreviation:
<abbr title="Differences between the original biblio and the imported" lang="en">Diff</abbr>
In translations (e.g. German), the line appears as follows:
<abbr title="Unterschiede zwischen Originaltitelsatz und importiertem Titelsatz" lang="en">Diff</abbr>
The lang attribute is wrong here, it is still "en".
The text language is the same as defined at the top of the page - or with other
words, the lang tag is superfluous.
This patch removes it.
To test:
Verify that code change makes sense.
Passes QA test and the change is logical
Signed-off-by: Alex Buckley <alexbuckley at catalyst.net.nz>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 25fa02272d16c98d49a6020e867f60bc0510d960
Author: Marc Véron <veron at veron.ch>
Date: Thu Jun 29 15:22:54 2017 +0200
Bug 18654 - Translatability: Get rid of tt directives starting with [%% in translation for itemsearch.tt
This patch removes entries like the following in translations of itemsearch.tt:
"[%% INCLUDE form_field_select name=\"homebranch\" options = branches "
"empty_option = \"All libraries\" %%] [%% INCLUDE form_field_select name="
"\"holdingbranch\" options = branches empty_option = \"All libraries\" %%] %s "
"[%% INCLUDE form_field_select name=\"location\" options = locations "
"empty_option = \"All locations\" %%] %s "
New patch on top of Bug 18633 that resolves parts of initial comment.
To test:
- Verify that in itemsearch.tt no tt directives are splitted by new lines
(search for [% INCLUDE )
- Verify that itemsearch.tt works as before
Followed test plan and verified that tt directives are not split by new
lines, the changes to the fieldset tags in comment 3 have been removed
and itemtype.tt still works correctly as before
Signed-off-by: Alex Buckley <alexbuckley at catalyst.net.nz>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 2ee82801c7a8686523f9c5e95b0f43d44e52e4ab
Author: Marc Véron <veron at veron.ch>
Date: Mon May 22 21:09:06 2017 +0200
Bug 18652: Get rid of tt directive in translation for uncertainprice.tt
Translation tool shows toe following for ncertainprice.tt
0; url=[% scriptname %]?booksellerid=[% booksellerid %]
This patch fixes it.
To test:
- Apply patch
- Verify that code change makes sense
- Verify that Home > Acquisitions > [vendor] > Uncertain prices for [vendor]
works as before
- Additional test (for a langunage 'aa-AA')
perl translate create aa-AA
verify that line 41 no longer appears in aa-AA-staff-prog.po
Amended to switch from BLOCK to a template variable, see comment #5
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 79338bde3e01708fe331a54745f45c620c121805
Author: Marc Véron <veron at veron.ch>
Date: Fri Aug 4 10:52:13 2017 +0200
Bug 18649: Translatability: Get rid of tt directive in translation for admin/categories.tt and onboardingstep2.tt
New patch without trailing IF construction in tt directives as
requested in comment #28
To test: Verify that translation tool no longer shows tt directives as
described in comment #1
New patch, needs SO.
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 59e95182cf1862095fb307cc08ba2a45d5630c11
Author: Marc Véron <veron at veron.ch>
Date: Wed Jun 14 09:02:59 2017 +0200
Bug 18629: (followup) Plain text "Continue..." instead of BLOCK
Remove
[% BLOCK txt_continue %]Continue to the next step[% END %]
...and restore original text
See comment #19 and comment #20
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit bd81047f42164328654b9fb65d21de7ec8532b3b
Author: Marc Véron <veron at veron.ch>
Date: Fri May 26 13:32:06 2017 +0200
Bug 18629 - Translatability: Fix problems with web installer 17.05
The new web installer for 17.05 has a great new design - but it has a lot of
translatability issues. Some strings are not picked for translations,
some expose the content of tt directives, and others are splitted by
html tags, resulting in small text fragments that are not easy to translate.
This patch weeds out such translation problems for step1.tt, step2.tt and
step3.tt
To test:
- Apply patch (on top of Bug 18665 because of html tags inside of
tt directives in step2.tt)
- Prepare a fresh install (drop database, create database)
- Walk through the installation process and verify that it works as before
- Verify that string changes (in English) make sense
- Create a translation( cd misc/translator, then perl translate create aa-AA)
then: vim po/aa-AA-staff-prog.po and search for: /installer\/step
Verify that strings for step1.tt, step2.tt, step3.tt are not fragmented,
do not contain [%%, and are easily translatable (make sense without having
to search in source files for context).
(Amended to remove some superfluous chomps 2017-06-27 mv)
Signed-off-by: Alex Buckley <alexbuckley at catalyst.net.nz>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 921e39a7ae123c112a7f09ec4bebf91e20235fec
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Tue Jun 6 13:31:29 2017 +0200
Bug 17807: [Follow-up] Use marcxml for marc21 prefix
Not sure what happened here, but this is an easy fix.
Test plan:
Try oai.pl with marcxml, marc21 and oai_dc again.
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 6719eee83a5232af18693ff8aef71d7464881d03
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Wed Dec 21 15:03:18 2016 +0100
Bug 17807: Use XSLT_Handler in Koha::OAI
Replacing some code in the OAI modules by a call to an existing module.
Note that the xmldoc format is used in the transform call to get a xml
document object.
The stylesheet method of Repository now only returns the name of the xsl
file to be used instead of a cached xslt object. Similar functionality
inside XSLT_Handler is used when calling transform.
Note: We still lack unit tests in this area. I did not see the need for
adding something for stylesheet since it only returns a simple string.
The other change is made in Record::new; there are no tests for this
module yet and the heart of the change here is actually tested already
in XSLT_Handler.t.
Note: I benchmarked calls to Repository in the old and the new situation
and did not see significant changes.
Test plan:
[1] Run t/db_dependent/OAI/Server.t
[2] Run oai.pl with ListRecords and marcxml.
[3] Run oai.pl with ListRecords and oai_dc.
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 60bddbcc96bf92777a5954c2842d36ca55f12d46
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Wed Dec 21 15:50:31 2016 +0100
Bug 17807: Add format parameter to XSLT_Handler->transform
Format may be chars (default), bytes or xmldoc.
Note: xmldoc is a XML::LibXML document object.
Since the default is chars, this does not affect current use.
Note: The format parameter (xmldoc) will be used later in one of the OAI
modules to prevent duplicated xml parsing.
Test plan:
Run t/db_dependent/XSLT_Handler.t
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 30048f4aabeec27fdf0a4f195f82c822eddab501
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Mon Aug 7 12:05:54 2017 -0300
Bug 17969: (QA followup) Add POD
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit e63eee05a09cc0373491cce213e012ffc011b9f3
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Jan 19 20:11:21 2017 +0100
Bug 17969: Refactor the way <<items.content>> is generated
<<items.content>> is generated 4x in advance_notices.pl and once in
overdue_notices.pl
It would be better to have it in C4::Letters.
It will enforce the fact that it already has the same behavior, make it
testable and reusable.
Test plan:
Use the <<items.content>> tag for advance and overdue notices.
The generated notices must be the same as before this patch.
Followed test plan, works as expected.
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit bc09af634c92dc83f4eb28761bcff428481f6daf
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Aug 2 11:52:11 2017 -0300
Bug 19025: Remove C4::Reserves::GetReserveInfo
Test plan:
git grep GetReserveInfo
should not return results
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 3ecc6fd8c68af0ed410ee2ea77060999993220a7
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Aug 2 11:49:08 2017 -0300
Bug 19025: Move GetReserveInfo to Koha::Holds
This subroutine is only used once and can be replaced with a call to
Koha::Holds->find
It will avoid unnecessary joins.
Test plan:
- Define a HOLD_SLIP template notice using fields from the tables
reserves, branches, borrowers, biblio, biblioitems and items.
- Generate one and make sure the values are correctly filled
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 1076a0edf32b621da54c53ea71595885f7e14c38
Author: Lee Jamison <ldjamison at marywood.edu>
Date: Fri Aug 11 18:58:53 2017 +0000
Bug 19088: plugins-upload causes error log noise
After uploading a plugin the error log indicates
use of uninitialized value in $op. This patch
silences the noise.
To test:
1) Set <enable_plugins> to 1 (one) in koha-conf.xml.
2) Set the UseKohaPlugins system preference to 'Enable'.
3) Navigate to Administration -> Manage plugins.
4) Install the test plugin KPZ file attached to this bug.
5) Notice the uninitialized value noise in the error log.
6) Uninstall the plugin (plack restart may be required if plack is
enabled).
7) Apply patch.
8) Install the plugin again.
9) Notice no noise in the error log.
10) Run qa tools.
11) Run prove t/db_dependent/Plugins.t
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 86e8612c020cea44be123be45f2e503af38ef98b
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Wed Aug 30 09:37:48 2017 -0400
Bug 19205 - Pay selected fine generates 500 error
Using the pay selected option from the borrowers account, to pay for one specific fine among other gives a 500 error, despite the payment going through.
Test Plan:
1) Add two fines using the Create manual invoice function.
2) Select one fine and "pay selected".
3) Pay a part of the amount.
4) Note error
5) Apply this patch
6) Repeat steps 1-3
7) No error!
Signed-off-by: Andreas Hedström Mace <andreas.hedstrom.mace at sub.su.se>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit ce2561441c3c6e5bdc5ee7011d250c24a2d49105
Author: Serhij Dubyk {Сергій Дубик} <serhijdubyk at gmail.com>
Date: Wed Aug 23 17:15:17 2017 +0300
Bug 18537 - Update Ukrainian installer sample files for 17.05
Update and translate sample SQL files of the Ukrainian installer.
To test:
- Start with an empty database
- Install uk-UA
- Run the web installer in uk-UA/Ukrainian
- Verify all files load without any problems.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
-----------------------------------------------------------------------
Summary of changes:
C4/Letters.pm | 33 +
C4/Reserves.pm | 57 +-
Koha/OAI/Server/Record.pm | 22 +-
Koha/OAI/Server/Repository.pm | 32 +-
Koha/XSLT_Handler.pm | 29 +-
.../authorised_values_[CCODE].sql | 12 +-
.../authorised_values_[COUNTRY].sql | 715 ++++-------
.../authorised_values_[DAMAGED].sql | 11 +-
.../authorised_values_[IND_852].sql | 41 +-
.../authorised_values_[IND_852].txt | 2 +-
.../authorised_values/authorised_values_[LANG].sql | 1348 +++++++-------------
.../authorised_values/authorised_values_[LANG].txt | 2 +-
.../authorised_values/authorised_values_[LOC].sql | 25 +-
.../authorised_values/authorised_values_[LOC].txt | 2 +-
.../authorised_values/authorised_values_[LOST].sql | 18 +-
.../authorised_values/authorised_values_[LOST].txt | 2 +-
.../authorised_values_[NOT_LOAN].sql | 20 +-
.../authorised_values_[NOT_LOAN].txt | 2 +-
.../authorised_values_[RESTRICTED].sql | 11 +-
.../authorised_values_[RESTRICTED].txt | 2 +-
.../authorised_values_[STACK].sql | 6 +-
.../authorised_values_[SUGGEST].sql | 17 +-
.../authorised_values_[SUGGEST_FORMAT].sql | 13 +-
.../authorised_values_[SUPPRESS].sql | 16 +-
.../authorised_values_[WITHDRAWN].sql | 9 +-
.../authorised_values_[WITHDRAWN].txt | 2 +-
.../data/mysql/uk-UA/mandatory/auth_values.sql | 13 +-
.../data/mysql/uk-UA/mandatory/class_sources.sql | 141 +-
.../uk-UA/mandatory/message_transport_types.sql | 2 +-
.../mysql/uk-UA/mandatory/sample_frequencies.sql | 48 +-
.../mysql/uk-UA/mandatory/sample_frequencies.txt | 2 +-
.../data/mysql/uk-UA/mandatory/sample_notices.sql | 290 +++--
.../sample_notices_message_attributes.sql | 24 +-
.../sample_notices_message_transports.sql | 42 +-
.../uk-UA/mandatory/sample_numberpatterns.sql | 77 +-
.../uk-UA/mandatory/sample_numberpatterns.txt | 2 +-
installer/data/mysql/uk-UA/mandatory/stopwords.txt | 1 -
...m_preferences_full_optimal_for_install_only.sql | 33 -
...m_preferences_full_optimal_for_install_only.txt | 1 -
...stem_preferences_optimal_values_insert_only.sql | 88 --
...stem_preferences_optimal_values_insert_only.txt | 1 -
.../marc21_authorities_DEFAULT_general.sql | 38 +-
.../marc21_bibliographic_DEFAULT_general.sql | 406 +++++-
.../marc21_bibliographic_DEFAULT_local.sql | 4 +-
.../marcflavour/marc21/optional/fieldmapping.sql | 13 +-
.../marc21_authorities_CHRON_TERM_general.sql | 2 +-
.../marc21_authorities_CORPO_NAME_general.sql | 2 +-
.../marc21_authorities_GENRE-FORM_general.sql | 2 +-
.../marc21_authorities_GEOGR_NAME_general.sql | 2 +-
.../marc21_authorities_MEETI_NAME_general.sql | 2 +-
.../marc21_authorities_PERSO_NAME_general.sql | 2 +-
.../marc21_authorities_TOPIC_TERM_general.sql | 2 +-
.../marc21_authorities_UNIF_TITLE_general.sql | 2 +-
.../optional/marc21_bibliographic_AR_general.sql | 6 +-
.../optional/marc21_bibliographic_AR_local.sql | 4 +-
.../optional/marc21_bibliographic_BKS_general.sql | 4 +-
.../optional/marc21_bibliographic_BKS_local.sql | 4 +-
.../optional/marc21_bibliographic_CF_general.sql | 4 +-
.../optional/marc21_bibliographic_CF_local.sql | 4 +-
.../optional/marc21_bibliographic_FA_general.sql | 12 +-
.../optional/marc21_bibliographic_IR_general.sql | 4 +-
.../optional/marc21_bibliographic_IR_local.sql | 4 +-
.../optional/marc21_bibliographic_KT_general.sql | 4 +-
.../optional/marc21_bibliographic_KT_local.sql | 4 +-
.../optional/marc21_bibliographic_SER_general.sql | 4 +-
.../optional/marc21_bibliographic_SER_local.sql | 4 +-
.../optional/marc21_bibliographic_SR_general.sql | 4 +-
.../optional/marc21_bibliographic_SR_local.sql | 4 +-
.../optional/marc21_bibliographic_VR_general.sql | 4 +-
.../optional/marc21_bibliographic_VR_local.sql | 4 +-
.../optional/marc21_default_matching_rules.sql | 14 +-
.../optional/marc21_default_matching_rules.txt | 6 +-
.../unimarc_bibliographic_DEFAULT_general.sql | 345 ++---
.../unimarc_bibliographic_DEFAULT_local_995.sql | 411 ------
.../unimarc_bibliographic_DEFAULT_local_995.txt | 1 -
.../optional/unimarc_authorities_CO_general.sql | 3 +-
.../optional/unimarc_authorities_NP_general.sql | 3 +-
.../unimarc_authorities_SAUTTIT_general.sql | 3 +-
.../optional/unimarc_authorities_SAUT_general.sql | 3 +-
.../optional/unimarc_authorities_SCO_general.sql | 3 +-
.../optional/unimarc_authorities_SNC_general.sql | 3 +-
.../optional/unimarc_authorities_SNG_general.sql | 3 +-
.../optional/unimarc_authorities_STU_general.sql | 3 +-
.../optional/unimarc_authorities_TU_general.sql | 3 +-
.../optional/unimarc_bibliographic_AN_general.sql | 173 ++-
.../optional/unimarc_bibliographic_AN_local.sql | 264 +---
.../optional/unimarc_bibliographic_AUD_general.sql | 57 +-
.../optional/unimarc_bibliographic_AUD_local.sql | 264 +---
.../unimarc_bibliographic_BOOK_general.sql | 72 +-
.../optional/unimarc_bibliographic_BOOK_local.sql | 264 +---
...rc_bibliographic_DEFAULT_local_952_obsolete.sql | 147 ---
...rc_bibliographic_DEFAULT_local_952_obsolete.txt | 1 -
.../optional/unimarc_bibliographic_EL_general.sql | 61 +-
.../optional/unimarc_bibliographic_EL_local.sql | 264 +---
.../optional/unimarc_bibliographic_MIN_general.sql | 54 +-
.../optional/unimarc_bibliographic_MIN_local.sql | 262 +---
.../unimarc_bibliographic_NOTE_general.sql | 63 +-
.../optional/unimarc_bibliographic_NOTE_local.sql | 264 +---
.../optional/unimarc_bibliographic_PER_general.sql | 178 ++-
.../optional/unimarc_bibliographic_PER_local.sql | 264 +---
.../unimarc_bibliographic_TECH_general.sql | 69 +-
.../optional/unimarc_bibliographic_TECH_local.sql | 264 +---
.../optional/unimarc_default_matching_rules.sql | 20 +-
.../optional/unimarc_default_matching_rules.txt | 2 +-
.../data/mysql/uk-UA/optional/example_branches.sql | 39 -
.../data/mysql/uk-UA/optional/example_branches.txt | 1 -
installer/data/mysql/uk-UA/optional/holidays.sql | 24 -
installer/data/mysql/uk-UA/optional/holidays.txt | 1 -
.../mysql/uk-UA/optional/library_item_types.sql | 102 --
.../mysql/uk-UA/optional/library_item_types.txt | 1 -
.../data/mysql/uk-UA/optional/patron_atributes.sql | 131 +-
.../mysql/uk-UA/optional/patron_categories.sql | 101 +-
.../mysql/uk-UA/optional/patron_categories.txt | 2 +-
.../data/mysql/uk-UA/optional/print_labels.sql | 24 -
.../data/mysql/uk-UA/optional/print_labels.txt | 7 -
.../data/mysql/uk-UA/optional/sample_cities.sql | 80 +-
.../data/mysql/uk-UA/optional/sample_currency.sql | 17 +-
.../data/mysql/uk-UA/optional/sample_news.sql | 58 +-
.../data/mysql/uk-UA/optional/sample_notices.sql | 38 -
.../data/mysql/uk-UA/optional/sample_notices.txt | 1 -
.../uk-UA/optional/sample_user_suggestions.sql | 12 +-
.../uk-UA/optional/z39-50servers_collection.sql | 11 -
.../uk-UA/optional/z39-50servers_collection.txt | 1 -
.../prog/en/includes/patroncards-errors.inc | 58 +-
.../prog/en/modules/acqui/uncertainprice.tt | 3 +-
.../prog/en/modules/admin/categories.tt | 6 +-
.../prog/en/modules/catalogue/itemsearch.tt | 36 +-
.../intranet-tmpl/prog/en/modules/clubs/clubs.tt | 164 ++-
.../prog/en/modules/installer/step1.tt | 3 +-
.../prog/en/modules/installer/step2.tt | 38 +-
.../prog/en/modules/installer/step3.tt | 21 +-
.../prog/en/modules/onboarding/onboardingstep2.tt | 6 +-
.../prog/en/modules/patron_lists/lists.tt | 2 +-
.../prog/en/modules/tools/manage-marc-import.tt | 2 +-
.../en/includes/authorities-search-results.inc | 28 +-
.../bootstrap/en/includes/item-status.inc | 10 +-
.../bootstrap/en/includes/masthead-langmenu.inc | 8 +-
.../bootstrap/en/includes/openlibrary-readapi.inc | 10 +-
.../bootstrap/en/modules/opac-advsearch.tt | 24 +-
.../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 86 +-
.../bootstrap/en/modules/opac-memberentry.tt | 244 ++--
.../bootstrap/en/modules/opac-messaging.tt | 22 +-
members/paycollect.pl | 2 +-
misc/cronjobs/advance_notices.pl | 18 +-
misc/cronjobs/overdue_notices.pl | 7 +-
plugins/plugins-upload.pl | 2 +-
t/db_dependent/Holds.t | 9 +-
t/db_dependent/Letters.t | 36 +-
t/db_dependent/Reserves/GetReserveFee.t | 1 -
t/db_dependent/XSLT_Handler.t | 7 +-
150 files changed, 3279 insertions(+), 5805 deletions(-)
delete mode 100644 installer/data/mysql/uk-UA/mandatory/stopwords.txt
delete mode 100644 installer/data/mysql/uk-UA/mandatory/system_preferences_full_optimal_for_install_only.sql
delete mode 100644 installer/data/mysql/uk-UA/mandatory/system_preferences_full_optimal_for_install_only.txt
delete mode 100644 installer/data/mysql/uk-UA/mandatory/system_preferences_optimal_values_insert_only.sql
delete mode 100644 installer/data/mysql/uk-UA/mandatory/system_preferences_optimal_values_insert_only.txt
delete mode 100644 installer/data/mysql/uk-UA/marcflavour/unimarc/mandatory/unimarc_bibliographic_DEFAULT_local_995.sql
delete mode 100644 installer/data/mysql/uk-UA/marcflavour/unimarc/mandatory/unimarc_bibliographic_DEFAULT_local_995.txt
delete mode 100644 installer/data/mysql/uk-UA/marcflavour/unimarc/optional/unimarc_bibliographic_DEFAULT_local_952_obsolete.sql
delete mode 100644 installer/data/mysql/uk-UA/marcflavour/unimarc/optional/unimarc_bibliographic_DEFAULT_local_952_obsolete.txt
delete mode 100644 installer/data/mysql/uk-UA/optional/example_branches.sql
delete mode 100644 installer/data/mysql/uk-UA/optional/example_branches.txt
delete mode 100644 installer/data/mysql/uk-UA/optional/holidays.sql
delete mode 100644 installer/data/mysql/uk-UA/optional/holidays.txt
delete mode 100644 installer/data/mysql/uk-UA/optional/library_item_types.sql
delete mode 100644 installer/data/mysql/uk-UA/optional/library_item_types.txt
delete mode 100644 installer/data/mysql/uk-UA/optional/print_labels.sql
delete mode 100644 installer/data/mysql/uk-UA/optional/print_labels.txt
delete mode 100644 installer/data/mysql/uk-UA/optional/sample_notices.sql
delete mode 100644 installer/data/mysql/uk-UA/optional/sample_notices.txt
delete mode 100644 installer/data/mysql/uk-UA/optional/z39-50servers_collection.sql
delete mode 100644 installer/data/mysql/uk-UA/optional/z39-50servers_collection.txt
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list