[koha-commits] main Koha release repository branch master updated. v3.20.00-670-g6d40b4e
Git repo owner
gitmaster at git.koha-community.org
Fri Oct 2 17:06:06 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 6d40b4e320101d1f7bd81a0845f77b651cc2326f (commit)
via ff693f14fc9b1b0684dfab13d9533f45ab976be4 (commit)
via 945e7f5c04f11bb6950c5ef9149db541ad7a4087 (commit)
via f937e0adbe4746d8ef3e08f91d1abf567ebf4fba (commit)
via d2e7a9e4a848d291c1ca73620701774a4600073a (commit)
via 5d256e6b4b4045ca6845292e19707dd087a9db1b (commit)
via 4a43c3820555574ad7c83807b6b7a7db2032d340 (commit)
via f1eb76c831c9c6bc36a8b9d996b67942efe89cf1 (commit)
via bb3250260742b15e840774ac77d9086b5c4b3ea7 (commit)
via a988e9425ce1f8f4bf28b46473adac941d634973 (commit)
via 542ab0bce949eba3abc98ff1c433fe6099db105d (commit)
via 098fd64621043d7109b5e50f77df8be616243e1f (commit)
via ca268ad877a6712aa07cb7c873c918d6fdfac52d (commit)
from 49a09f6db2e10596deae056fea9e54bd8f5cd046 (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 6d40b4e320101d1f7bd81a0845f77b651cc2326f
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Fri Oct 2 11:01:19 2015 -0400
Bug 14522: (QA followup) Remove POD and fix tests
* Change POD to a brief comment
* Fix UT so it doesn't fail on Sundays
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
commit ff693f14fc9b1b0684dfab13d9533f45ab976be4
Author: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
Date: Fri Oct 2 11:39:33 2015 -0300
Bug 14522: (QA followup) tidy tests
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
commit 945e7f5c04f11bb6950c5ef9149db541ad7a4087
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Mon Sep 28 10:21:39 2015 -0400
Bug 14522: (QA followup) Remove $single_holidays global
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
commit f937e0adbe4746d8ef3e08f91d1abf567ebf4fba
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Fri Sep 25 13:03:02 2015 -0400
Bug 14522: (QA followup) Koha complains about missing C4::Dates on master
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
commit d2e7a9e4a848d291c1ca73620701774a4600073a
Author: Mason James <mtj at kohaaloha.com>
Date: Fri Sep 25 13:34:21 2015 +1200
Bug 14522: (followup) fix =cut typo
http://bugs.koha-community.org/show_bug.cgi?id=14522
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
commit 5d256e6b4b4045ca6845292e19707dd087a9db1b
Author: Mason James <mtj at kohaaloha.com>
Date: Tue Jul 14 22:53:10 2015 +1200
Bug 14522: Use Koha::Cache for accessing single_holidays()
this patch adds Koha::Cache functionality to the 'single_holidays' table
it is a performance patch for the problem described in BZ14315, only
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14315
it replaces slooow DateTime holiday objects with simple Ymd strings (19991230), then stores the strings in an @array using Koha::Cache
it does not attempt to add caching to all holiday tables - just the single_holidays table (at this stage
on my test (master-cd9a827); nytprof showed a time reduction of the single_holidays() sub - from 61.7s to 587ms
here are some before/after nytprof runs, (really on master-cd9a827, not 3.20)
http://x1.kohaaloha.com/i/nyt-bz14522-before/home-mason-g-k-3-20-x-Koha-Calendar-pm-1485-line.html#237
http://x1.kohaaloha.com/i/nyt-bz14522-after/home-mason-g-k-3-20-x-Koha-Calendar-pm-1485-line.html#280
to test...
1/ add a bunch of single_holidays to your test koha, (my table has 400 holiday rows)
2/ add a loong circ rule for an itemtype (my rule has 140 days)
3/ checkout an item to a user (took me 67 secs)
apply patch...
4/ return item
5/ repeats steps 1..3, (took me 6 secs)
6/ add/change/delete some various single_holidays, via Home->Tools->Calendar
ensure that your various changes have indeed saved correctly
for extra points...
7/ run tests t/Calendar.t and t/db_dependent/Holidays.t, with all tests pass OK
sudo koha-shell -c ' export PERL5LIB=/home/mason/g/k/master ; \
cd /home/mason/g/k/master ; perl t/Calendar.t ; perl t/db_dependent/Holidays.t ' testkoha
8/ run QA tool, with all tests pass OK
sudo koha-shell -c ' \
export KOHA_CONF=/etc/koha/sites/mayo2/koha-conf.xml \
export PERL5LIB=/home/mason/g/k/master:/home/mason/qa-test-tools/ ; \
cd /home/mason/g/k/master ; perl /home/mason/qa-test-tools/koha-qa.pl -c 1 ' testkoha
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 unc.edu.ar>
commit 4a43c3820555574ad7c83807b6b7a7db2032d340
Author: Marc Véron <veron at veron.ch>
Date: Thu Oct 1 10:51:18 2015 +0200
Bug 14929: Fix missing display of help page in contract management
This patch renames / moves the file
koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/acqcontract.tt
to
koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqcontract.tt
To test:
- Go to Home > Acquisition > [Vendor] > Contracts
(/cgi-bin/koha/admin/aqcontract.pl?booksellerid=XXXX)
- Verify that Help displays as appropriate.
Signed-off-by: Magnus Enger <magnus at libriotech.no>
Works as advertised. All the tabs similar to "Contracts" have
working help pages.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
commit f1eb76c831c9c6bc36a8b9d996b67942efe89cf1
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Sep 16 09:41:41 2015 +0100
Bug 14832: Fix encoding issues when exporting in RIS
Test plan:
1/ Make sure you have non ASCII chars in the title and the authors.
2/ Export the record in RIS
You should not see any encoding problems.
Signed-off-by: Magnus Enger <magnus at libriotech.no>
Before patch: RIS file has wrongly encoded chars
After patch: RIS file has no endcoding problems
Tested on a NORMARC setup.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Tested on a MARC21 and a UNIMARC database.
Problem only confirmed for UNIMARC, but no regressions in MARC21.
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
commit bb3250260742b15e840774ac77d9086b5c4b3ea7
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Sep 17 09:03:59 2015 +0100
Bug 14842: Wrong call to GetBranchItemRule
From bug 7981:
GetBranchItemRule expects an itemtype, a scalar.
Here $itemtype is a hashref returned by C4::ItemType->get.
So $itemtype->{itemtype} should be passed.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
commit a988e9425ce1f8f4bf28b46473adac941d634973
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Oct 1 11:58:41 2015 +0100
Bug 5371: (follow-up) Force no caching for private pages at the OPAC
Same as previous patch for opac-messaging.pl and opac-readingrecord.pl
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
commit 542ab0bce949eba3abc98ff1c433fe6099db105d
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Sep 17 12:45:15 2015 +0100
Bug 5371: Force no caching for private pages at the OPAC
In order no to slow too much the browsing, it is certainly not a good
idea to add this cache-control value for all pages at the OPAC.
This patch just adds where the author found it could be useful.
Test plan:
1/ Login at the OPAC
2/ Go on the account page (opac/opac-account.pl)
3/ Click log out
4/ Use the back button of your browser
Without this patch you will see the previous page.
With this patch, the previous page will be reloaded and you will be
redirected to the login form.
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
commit 098fd64621043d7109b5e50f77df8be616243e1f
Author: Frédéric Demians <f.demians at tamil.fr>
Date: Wed Sep 30 12:16:52 2015 +0200
Bug 14927: Returns item info when resumptionToken is used
To test:
- activate OAI-PMH with the inclusion of items as explained on bug 12252
- set the OAI-PMH:MaxCount to a low number, 50 for instance
- go to the OAI-PMH page to get the records : [your koha
catalogue]/cgi-bin/koha/oai.pl?verb=ListRecords&metadataPrefix=marcxml
- check that item data is included
- get the resumptionToken at the end of the xml
- got to the next page of records [your koha
catalogue]/cgi-bin/koha/oai.pl?verb=ListRecords&resumptionToken=[your
resumption token]
- check that item data is now missing
Apply the patch, and repeat previous steps: item data is back.
Signed-off-by: Gaetan Boisson <gaetan.boisson at biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
commit ca268ad877a6712aa07cb7c873c918d6fdfac52d
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Sep 15 11:44:32 2015 +0100
Bug 12311: Do not return a lost item if modified in a batch
If a item is lost and issued, and you modify it in a batch, the item
will be marked as returned. It should only be returned if the item is
marked as lost.
Test plan:
1/ Check an item out and mark it as lost
2/ Edit it in a batch (tools/batchMod.pl) and edit a field (notes for
instance)
3/ The item should still be issued to the patron
4/ Edit it in a batch and edit the lost value, marked it as not lost
5/ The item should still be issued to the patron
6/ Edit it in a batch and edit the lost value, marked it as lost
7/ The item should have been returned.
Signed-off-by: Hector Castro <hector.hecaxmmx at gmail.com>
Works as advertised. Just one comment, lost status can be changed only if you change default framework to another framework then edit the item. If you change it in Item menu at left side of screen this will remove the item from patron’s checkouts and patron charged for lost item.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
For testing purposes the lost item field can be set to visible
in the framework used. That will allow changing it without
returning it at the same time.
The other option is using the longoverdues.pl script.
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
-----------------------------------------------------------------------
Summary of changes:
C4/Calendar.pm | 56 +++++++++--
C4/Ris.pm | 2 +-
Koha/Calendar.pm | 100 +++++++++++++-------
circ/returns.pl | 2 +-
.../{acqui/acqcontract.tt => admin/aqcontract.tt} | 0
opac/oai.pl | 3 +-
opac/opac-account.pl | 3 +-
opac/opac-basket.pl | 2 +-
opac/opac-browser.pl | 2 +-
opac/opac-discharge.pl | 2 +-
opac/opac-memberentry.pl | 2 +-
opac/opac-messaging.pl | 2 +-
opac/opac-mymessages.pl | 2 +-
opac/opac-passwd.pl | 2 +-
opac/opac-privacy.pl | 2 +-
opac/opac-readingrecord.pl | 2 +-
opac/opac-reserve.pl | 3 +-
opac/opac-search-history.pl | 2 +-
opac/opac-user.pl | 3 +-
t/Calendar.t | 37 +++++---
t/db_dependent/Holidays.t | 78 ++++++++-------
tools/batchMod.pl | 2 +-
tools/newHolidays.pl | 8 ++
23 files changed, 208 insertions(+), 109 deletions(-)
rename koha-tmpl/intranet-tmpl/prog/en/modules/help/{acqui/acqcontract.tt => admin/aqcontract.tt} (100%)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list