[koha-commits] main Koha release repository branch master updated. v3.20.00-295-gcd9a827
Git repo owner
gitmaster at git.koha-community.org
Fri Jul 10 16:00:46 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 cd9a827b6928ed0cb80c78ebf897e2d77132296a (commit)
via 63427fce6074e8f3c5e0c37b9a76b1618fb0add0 (commit)
via 468d3d9c83a9760e796cdf43c7da2766ccf7c9b9 (commit)
via 5a57b3c163e6609aa99ab34e906aa05bd033d5ff (commit)
via c00c6e3c675da7f244d5042e1ba9be4648bd4ee9 (commit)
via 4e271637cd64ef733fadb231be51f22146a1a9e8 (commit)
via a350d02b995483bdd3bc7ede2271ad8a17190acc (commit)
via ddd2ec87523b1d5379c8a021347fa600ddd66cc2 (commit)
via 274942abbd299e39ba75b947023bdc881d4a54b4 (commit)
via e2ab42716825c5dedbb0036ae56a28e6119083f5 (commit)
from 6e9086fb2c4d031e6e99efca85ad4a5f3c0b9f42 (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 cd9a827b6928ed0cb80c78ebf897e2d77132296a
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Tue Jun 9 02:44:48 2015 +0200
Bug 14303: Fix item search CSV export - obsolete "by" and display of publication year for MARC21
The exported CSV file from the item search didn't display the publication
year in MARC21 installations and the title always contained 'by'
even if there was no author information to display. Also the by is
not needed by MARC21 as the data should include punctuation.
This basically copies the changes done to the JSON format
on bug 13859 to the CSV include.
To test: Switch from 'Screen' to 'CSV'
- Check publication date always displays (MARC21 and UNIMARC)
- Check that for MARC21 the 'by' has been removed from the title information
- Check that for UNIMARC the 'by' only displays when there is also
an author to display
Tested for MARC21, works as expected.
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
commit 63427fce6074e8f3c5e0c37b9a76b1618fb0add0
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Fri Jul 10 01:08:29 2015 -0400
Bug 14428: Remove C4::Input
Jonathan Druart agreed that C4::Input is vestigial code that should be removed.
Here is how I checked. First I found where C4::Input was used. Then, I checked
what functions are in the package: just checkdigit. Then, I confirmed that
checkdigit is not used at all in any acquisition, administration, or member
related perl scripts. Lastly, I took a look at our supposed test file for the
package. It was painfully sparse.
As such, this patch removes the test file and the package file, and removes
C4::Input references from these six files:
- acqui/addorderiso2709.pl
- acqui/basketgroup.pl
- acqui/neworderempty.pl
- acqui/uncertainprice.pl
- admin/aqplan.pl
- members/memberentry.pl
NOTE: neworderempty had 3 lines of it?! Didn't anyone see that?!
Here is the output of what I did to confirm this correction:
mtompset at debian:~/kohaclone$ git reset --hard origin/master
HEAD is now at 6e9086f Bug 3206: (QA followup) missing comma on sysprefs.sql
mtompset at debian:~/kohaclone$ git grep C4::Input
C4/Input.pm:package C4::Input; #assumes C4/Input
C4/Input.pm:C4::Input - Miscellaneous sanity checks
C4/Input.pm: use C4::Input;
acqui/addorderiso2709.pl:use C4::Input;
acqui/basketgroup.pl:use C4::Input;
acqui/neworderempty.pl:use C4::Input;
acqui/neworderempty.pl:use C4::Input;
acqui/neworderempty.pl:use C4::Input;
acqui/uncertainprice.pl:use C4::Input;
admin/aqplan.pl:use C4::Input;
members/memberentry.pl:use C4::Input;
t/Input.t: use_ok('C4::Input');
mtompset at debian:~/kohaclone$ grep sub C4/Input.pm
sub checkdigit ($;$) {
my $temp2 = substr($infl,$i,1);
if ($rem eq substr($infl,8,1)) {
} # sub checkdigit
mtompset at debian:~/kohaclone$ grep checkdigit `find acqui -type f`
mtompset at debian:~/kohaclone$ grep checkdigit `find admin -type f`
mtompset at debian:~/kohaclone$ grep checkdigit `find members -type f`
mtompset at debian:~/kohaclone$ cat t/Input.t
use strict;
use warnings;
use Test::More tests => 1;
BEGIN {
use_ok('C4::Input');
}
Apply this patch, and the output of git grep C4::Input will be empty.
Run koha qa test tools (kind of overkill)
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
commit 468d3d9c83a9760e796cdf43c7da2766ccf7c9b9
Author: Julian FIOL <julian.fiol at biblibre.com>
Date: Mon Jul 6 12:27:08 2015 +0200
Bug 14496: Improving opac-detail.pl performances
Get notes and subjects from MARC record
ONLY when XSLT is not activated.
It's useless doing it when XSLT is activated,
because XSLT takes care of it by its own.
=> With this patch, we are saving precious
milliseconds
I compared the display of some records in XSLT view with and without patch, was the same (as expected).
Signed-off-by: Marc Veron <veron at veron.ch>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
On a slower server, I saw a time save of 0.0274 to 0.0908 seconds (with XSLT).
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
commit 5a57b3c163e6609aa99ab34e906aa05bd033d5ff
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Wed Jul 8 18:25:45 2015 -0300
Bug 14508: 'New patron' dropdown empty list on circulation.pl
This patch makes includes/patron-toolbar.inc (the one in charge of
rendering the 'New patron' dropdown) make use of the Categories
Template Toolkit plugin to create the list of categories.
(1) To check the setup is sane:
- Go to the Patrons page
=> SUCCESS: The 'New patron' dropdown is populated
- Click on the [+] symbol on the Patron search on the top
=> SUCCESS: The Categories dropdown is populated
(2) To test the patch:
- On the checkout form, perform a patron search that
(a) returns more than one result
(b) returns zero results
- Click the dropdown menu to create a new patron
=> FAIL: Dropdown is empty
- Repeat for (a) or (b)
- Apply the patch and reload
=> SUCCESS: The dropdown is correctly populated
- Repeat (1)
=> SUCCESS: Nothing got broken
- Verify the logs
=> SUCCESS: No new warnings
- Sign off :-D
- Get a cookie
- Smile
Regards
Discussion: we might need a new bug to start cleaning stuff like this:
@categories=C4::Category->all;
if(scalar(@categories) < 1){
$no_add = 1;
$template->param(no_categories => 1);
}
else {
$template->param(categories=>\@categories);
}
but it belongs to a new bug me thinks. Well, suggestions are welcome, but this must
be fixed on stable ASAP so hurry :-D
Followed test plan, works as expected.
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
commit c00c6e3c675da7f244d5042e1ba9be4648bd4ee9
Author: Nicole C. Engard <nicole at bywatersolutions.com>
Date: Tue Jun 23 14:49:55 2015 -0500
Bug 14424: Add on site checkouts help for 3.20
There is no help for the pending on site checkouts report. This patch
adds it.
To test:
* visit pending on site checkouts
* click help
* confirm help is there and correct
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
commit 4e271637cd64ef733fadb231be51f22146a1a9e8
Author: Nicole C. Engard <nicole at bywatersolutions.com>
Date: Tue Jun 23 14:44:11 2015 -0500
Bug 14424: Update Acq Help for 3.20
This patch adds the missing order from subscription help and updates basket
help.
To test:
* Visit a basket, review the help
* Click order from a subscrption, review the help
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
commit a350d02b995483bdd3bc7ede2271ad8a17190acc
Author: Nicole C. Engard <nicole at bywatersolutions.com>
Date: Tue Jun 23 14:31:15 2015 -0500
Bug 14424: Update Discharge Help for 3.20
This patch adds the missing discharge help file and updates the moremember file with
info on discharges.
To test:
* Visit a patron
* View and confirm help is right
* Visit the discharge page on the patron
* Confirm help file loads and is right
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
commit ddd2ec87523b1d5379c8a021347fa600ddd66cc2
Author: Nicole C. Engard <nicole at bywatersolutions.com>
Date: Tue Jun 23 13:00:06 2015 -0500
Bug 14424: Update cataloging help for 3.20
This patch updates 3 help files for catalolging in 3.20
To test:
* Visit
* cataloging home
* cataloging a new record
* mergin bib records
* Confirm text is right and visible
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
commit 274942abbd299e39ba75b947023bdc881d4a54b4
Author: Nicole C. Engard <nicole at bywatersolutions.com>
Date: Tue Jun 23 12:45:17 2015 -0500
Bug 14424: Patron Help Files for 3.20
This patch updates the help files for 3.20
To test:
* Visit
* Main patron page
* Patron search page
* Patron permissions page
* Confirm the text is right on all three
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
commit e2ab42716825c5dedbb0036ae56a28e6119083f5
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Thu Jul 2 10:37:22 2015 +0200
Bug 14485: HTML comment disables translation in cataloguing/addbooks.tt
In cataloguing/addbooks.tt, the line :
[% total %] result(s) found in catalog,
is not present in PO files even after an update.
I've found that the cause is the previous HTML comment line.
This patch converts HTML comment into TT comment and adds a div to have a more comprehensive string to translate.
Test plan :
- without patch
- go into <sources>/misc/translator
- run PO update for example in french : translate update fr-FR
=> the text "result(s) found in catalog" is missing from PO file : fr-FR-staff-prog.po
- restore default PO files
- apply patch
- go into <sources>/misc/translator
- run PO update for example in french : translate update fr-FR
=> You find text "result(s) found in catalog" in PO file : fr-FR-staff-prog.po
Sponsored-by: Universidad de El Salvador
Signed-off-by: Hector Eduardo Castro Avalos <hector.hecaxmmx at gmail.com>
Works as advertised. Just one msgid appear with msgid "%s result(s) found in catalog,"
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
-----------------------------------------------------------------------
Summary of changes:
C4/Input.pm | 122 --------------------
acqui/addorderiso2709.pl | 1 -
acqui/basketgroup.pl | 1 -
acqui/neworderempty.pl | 3 -
acqui/uncertainprice.pl | 1 -
admin/aqplan.pl | 1 -
.../en/includes/catalogue/itemsearch_item.csv.inc | 3 +-
.../prog/en/includes/patron-toolbar.inc | 3 +
.../prog/en/modules/cataloguing/addbooks.tt | 8 +-
.../prog/en/modules/help/acqui/basket.tt | 13 +++
.../en/modules/help/acqui/newordersubscription.tt | 17 +++
.../prog/en/modules/help/cataloguing/addbiblio.tt | 22 ++--
.../prog/en/modules/help/cataloguing/addbooks.tt | 10 +-
.../prog/en/modules/help/cataloguing/merge.tt | 17 +--
.../prog/en/modules/help/circ/on-site_checkouts.tt | 11 ++
.../prog/en/modules/help/members/discharge.tt | 21 ++++
.../prog/en/modules/help/members/member-flags.tt | 55 ++++++++-
.../prog/en/modules/help/members/member.tt | 14 ++-
.../prog/en/modules/help/members/members-home.tt | 14 ++-
.../prog/en/modules/help/members/moremember.tt | 16 +++
members/memberentry.pl | 1 -
opac/opac-detail.pl | 31 ++---
t/Input.t | 14 ---
23 files changed, 206 insertions(+), 193 deletions(-)
delete mode 100644 C4/Input.pm
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/newordersubscription.tt
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/on-site_checkouts.tt
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/members/discharge.tt
delete mode 100755 t/Input.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list