[koha-commits] main Koha release repository branch master updated. v18.05.00-932-ge78af53
Git repo owner
gitmaster at git.koha-community.org
Fri Oct 5 18:37:49 CEST 2018
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 e78af533df94b155570116f6f7c4b5a2e5e4e2f2 (commit)
via 7feca40ba1ce8e57fadd78dc643cb7e3d5da5942 (commit)
via 6e499dd5672e5b22ecbfe202146041d3715fc584 (commit)
via 27130dbf9923cbf97f01810ec6dc230f96770170 (commit)
via a0de8cf1680caae6545ed8fdf371c6cd8b5d36b2 (commit)
via 2cb8e9755af0fdfd25bebc465f9a415d485ceea0 (commit)
via 4e76fa419d699c988eba92767c435dac01fc7c06 (commit)
via 3fb069f8eca1674a10cb2e502ea76ae9d4a90e2d (commit)
via a30b6b893824a8fece31e453e23125101338f84b (commit)
via 5e41933470849377d0dec2c93a71c9b8d1ddd5d8 (commit)
via ac5e04b85d0ac05053e338f400a31dce3b0edb1e (commit)
via 3b489bc24e2b9c39110ed0ec7dc4f9ff28f12966 (commit)
via 4f598764064e499fe0fee23b9873c388f41e6692 (commit)
via da9bd7521996c464c6488e9914b76847ba51a49e (commit)
via f185785b8cb02a5882cb45219b7af39f99025ef0 (commit)
via 2eeee4c5253d8e30e51b4890849fcbee9c17ee67 (commit)
via 5c31b9c75e3beeeb26ab9f96c568e73ec932874f (commit)
via b9727d20582164da578d125db80576e72e050d2a (commit)
via 5a931e4e93cf706602551423e03b8702166bb41c (commit)
via 35265c0a9bbdb20f40fa49f592aa9a772d27f253 (commit)
via f576fb9c3ea88fad65ad83076e59f4f728e908ce (commit)
via 9b0902928872d81e97627bee6c7adf9e563614c5 (commit)
via 9de145077abb76b944f277e80a34a81a8a2a0df8 (commit)
via e0ca753a2fb4c0509d727ec1d6b5c47d3bf14df7 (commit)
via 1e856e7e7316749f59cb4e721e352b0a60237def (commit)
via ff1b0ba7cae7ee72d1fc4ab0c2d1a1e1b40ac7fe (commit)
via 47c7f7c64c723ee2944d4c77a71d2f2d0ab0851c (commit)
via a37637e30357258885e9d0c1c7a30366869dcb08 (commit)
via d74a05d4fe81a599c030024f7944d2bdcca43d12 (commit)
via 8aa86cdf2d5e0dbda7d21394e52f37ba17a8064c (commit)
via b4d8d13f14a7022e603ac30dd8cee0605e9d269d (commit)
via 16fe5d7f30ede8147cb946095da9d529d057c789 (commit)
via 6b053546add6fa9d002d757e5b493e68506e5290 (commit)
via b313d7c98f6d753caa18cc572ec355f16c4367b1 (commit)
via 7fbd50e3aa07e46f0558d4f52231896937c998bc (commit)
from 051eef767ab3723a63e1bfff50864ab441e05f23 (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 e78af533df94b155570116f6f7c4b5a2e5e4e2f2
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Fri Oct 5 14:25:34 2018 +0200
Bug 21481: (QA follow-up) Remove last reference to text-extract2
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 7feca40ba1ce8e57fadd78dc643cb7e3d5da5942
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Wed Oct 3 10:42:44 2018 +0000
Bug 21481: Remove reference of *-staff-help.po from koha-translate
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 6e499dd5672e5b22ecbfe202146041d3715fc584
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Wed Oct 3 10:39:58 2018 +0000
Bug 21481: Remove obsolete files from translation toolkit
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Conflicts:
misc/translator/text-extract.pl
misc/translator/text-extract2.pl
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 27130dbf9923cbf97f01810ec6dc230f96770170
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Wed Oct 3 10:20:29 2018 +0000
Bug 21481: Remove *-staf-help.po files
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit a0de8cf1680caae6545ed8fdf371c6cd8b5d36b2
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Wed Oct 3 10:19:40 2018 +0000
Bug 21481: Remove references to help from LangInstaller
Test plan:
1) Aply the patches
2) cd misc/translator
3) Run these command one by one:
./translate install <lang-code>
./translate update <lang-code>
./translate create <lang-code>
4) All should not end with error and must do what is documented (see
./translate --help)
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 2cb8e9755af0fdfd25bebc465f9a415d485ceea0
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Oct 5 14:49:13 2018 +0000
Bug 18887: DBRev 18.06.00.036
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 4e76fa419d699c988eba92767c435dac01fc7c06
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Oct 3 11:04:45 2018 -0300
Bug 18887: Make DB update idempotent
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 3fb069f8eca1674a10cb2e502ea76ae9d4a90e2d
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Mon Oct 1 19:14:41 2018 +0000
Bug 18887: (QA follow-up) Remove last occurences of old max_holds
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit a30b6b893824a8fece31e453e23125101338f84b
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Sat Sep 29 18:18:03 2018 -0300
Bug 18887: Add tests
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 5e41933470849377d0dec2c93a71c9b8d1ddd5d8
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Sat Sep 29 18:17:52 2018 -0300
Bug 18887: Replace croak with exceptions
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit ac5e04b85d0ac05053e338f400a31dce3b0edb1e
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Sat Sep 29 17:41:08 2018 -0300
Bug 18887: Fix POD c/p issues
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 3b489bc24e2b9c39110ed0ec7dc4f9ff28f12966
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Sat Sep 29 17:29:44 2018 -0300
Bug 18887: Add foreign keys
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 4f598764064e499fe0fee23b9873c388f41e6692
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Sat Sep 15 13:08:16 2018 -0700
Bug 18887: Add 2 missing html filters
Signed-off-by: Lisette Scheer <lisetteslatah at gmail.com>
Signed-off-by: Jesse Maseto <jesse at bywatersolution.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit da9bd7521996c464c6488e9914b76847ba51a49e
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Jul 24 12:25:09 2018 -0300
Bug 18887: Use get_effective_rule instead of search
Signed-off-by: Lisette Scheer <lisetteslatah at gmail.com>
Signed-off-by: Jesse Maseto <jesse at bywatersolution.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit f185785b8cb02a5882cb45219b7af39f99025ef0
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Jul 24 11:04:35 2018 -0300
Bug 18887: Insert undef instead of '*'
Koha::CirculationRules->get_effective_rule will become the method to
call to retrieve a specific rule, we should start using it when
possible.
Moreover undef could replace '*' to mean 'any', that way we will be able
to add FK on circulation_rules
TODO: Add more tests
Signed-off-by: Lisette Scheer <lisetteslatah at gmail.com>
Signed-off-by: Jesse Maseto <jesse at bywatersolution.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 2eeee4c5253d8e30e51b4890849fcbee9c17ee67
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Jul 24 09:01:33 2018 -0300
Bug 18887: Fix DB structure issues
- Make atomic update idempotent
- Correct COLLAT (atomic update)
- Add index on rule_name (kohastructure.sql)
- Add rule_name to the unique constraint (kohastructure.sql)
- Remove max_holds columns (kohastructure.sql)
Signed-off-by: Lisette Scheer <lisetteslatah at gmail.com>
Signed-off-by: Jesse Maseto <jesse at bywatersolution.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 5c31b9c75e3beeeb26ab9f96c568e73ec932874f
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Wed Jul 18 13:55:19 2018 -0400
Bug 18887: Fix issues caused by rebase
Signed-off-by: Lisette Scheer <lisetteslatah at gmail.com>
Signed-off-by: Jesse Maseto <jesse at bywatersolution.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit b9727d20582164da578d125db80576e72e050d2a
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Wed Jul 18 17:35:46 2018 +0000
Bug 18887: (follow-up) Fix null/empty behavior
Signed-off-by: Lisette Scheer <lisetteslatah at gmail.com>
Signed-off-by: Jesse Maseto <jesse at bywatersolution.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 5a931e4e93cf706602551423e03b8702166bb41c
Author: Jesse Weaver <pianohacker at gmail.com>
Date: Wed Oct 4 16:50:26 2017 -0600
Bug 18887: (follow-up) Fix behavior for default branch/category
Also, fix a couple small QA issues.
Signed-off-by: Lisette Scheer <lisetteslatah at gmail.com>
Signed-off-by: Jesse Maseto <jesse at bywatersolution.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 35265c0a9bbdb20f40fa49f592aa9a772d27f253
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Fri Jun 30 14:23:55 2017 -0400
Bug 18887: Port max_holds rules to new CirculationRules system
This is the first step in the circulation rules revamp as detailed
in the RFF https://wiki.koha-community.org/wiki/Circulation_Rules_Interface_and_Backend_Revamp_RFC
This patch moves the recent max_holds rule to the new circulation_rules table.
Test Plan:
1) Apply this patch
2) Run updatedatabase.pl
3) Go to the circ rules editor, note the new max holds rules
by patron category in the "Checkout limit by patron category".
( Should we rename this section? )
4) Create find a patron that is allowed to place a hold, count the
number of holds that patron has. Lets make that number 'X'.
5) Set the new max holds rule to X for "All libraries"
6) Note the patron can no longer place another hold
7) Set the new max holds rule to X + 1 for the patron's home library
8) Note the patron can again place another hold
9) Set the new max holds rule to X for the patron's home library
10) Note the patron can no longer place another hold
Signed-off-by: Lisette Scheer <lisetteslatah at gmail.com>
Signed-off-by: Jesse Maseto <jesse at bywatersolution.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit f576fb9c3ea88fad65ad83076e59f4f728e908ce
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Mon Mar 6 18:20:03 2017 +0000
Bug 18887: Add Koha::CirculationRule(s)
Signed-off-by: Lisette Scheer <lisetteslatah at gmail.com>
Signed-off-by: Jesse Maseto <jesse at bywatersolution.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 9b0902928872d81e97627bee6c7adf9e563614c5
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Mon Mar 6 17:35:40 2017 +0000
Bug 18887: Update database
Signed-off-by: Lisette Scheer <lisetteslatah at gmail.com>
Signed-off-by: Jesse Maseto <jesse at bywatersolution.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 9de145077abb76b944f277e80a34a81a8a2a0df8
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Wed Oct 3 17:56:17 2018 +0000
Bug 7143: Update about page for new dev - Cori Lynn Arnold`
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit e0ca753a2fb4c0509d727ec1d6b5c47d3bf14df7
Author: Cori Lynn Arnold <carnold at dgiinc.com>
Date: Mon Oct 1 14:36:26 2018 +0000
Bug 18584: Removed white space in C4/Matcher.pm
Test Plan:
1-go to C4/Matcher.pm
2-verify there is no whitespace at line 25
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 1e856e7e7316749f59cb4e721e352b0a60237def
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Wed Apr 25 16:44:03 2018 +0000
Bug 17237: Remove CREATE USER 'user'@'%' line
Having a 'user'@'%' line decreases database security.
Bug 16690 closes the need for such a line, and this
bug removes the use of it.
TEST PLAN
---------
While this depends on 16690, it is not required for testing.
On a kohadev box:
sudo koha-create --create-db test_17237_a
git bz apply 17237
sudo perl ~/misc4dev/cp_debian_files.pl
restart_all
sudo systemctl daemon-reload
sudo koha-create --create_db test_17237_b
sudo mysql -u root
SELECT user,host from mysql.user;
-- test_17237_a will have two entries, one being '%'
-- test_17237_b will only have one entry, not '%'
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit ff1b0ba7cae7ee72d1fc4ab0c2d1a1e1b40ac7fe
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Mon Oct 1 14:05:40 2018 -0400
Bug 21352: Add missing USE statements
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 47c7f7c64c723ee2944d4c77a71d2f2d0ab0851c
Author: Kyle M Hall <kyle at bywatersolutiosn.com>
Date: Thu Sep 20 15:30:49 2018 -0400
Bug 21352: Use the raw filter for plugin hooks, both opac and staff side
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit a37637e30357258885e9d0c1c7a30366869dcb08
Author: Kyle M Hall <kyle at bywatersolutiosn.com>
Date: Sat Sep 15 09:48:49 2018 -0700
Bug 21352: Allow plugins to add CSS and Javascript to Staff interface
We should have plugin hooks for the staff interface just like we have for the OPAC as detailed on bug 20181.
Test Plan:
1) Apply this patch
2) Download and install the Kitchen Sink plugin ( v2.1.19 or later )
https://github.com/bywatersolutions/koha-plugin-kitchen-sink/releases/download/v2.1.19/koha-plugin-kitchen-sink-v2.1.19.kpz
3) Install the plugin
4) Restart all the things if you can ( restart_all if you are using kohadevbox )
This will ensure the plugin takes effect right away, it should be
necessary but it won't hurt anything!
5) Load the staff intranet, notice you get an console error log message and the background
for your staff intranet is now orange ( assuming you've not customized the
staff intranet in any way )
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit d74a05d4fe81a599c030024f7944d2bdcca43d12
Author: Magnus Enger <magnus at libriotech.no>
Date: Thu Sep 6 13:23:17 2018 +0000
Bug 21322: process_message_queue.pl --type should take an argument
The help for this script says:
-t --type: If supplied, only processes this type of message ( email, sms )
Currently, the type argument is set up wrong, so it does not look
for an argument. This patch fixes that.
To test, run this command (should work in kohadevbox) or something
similar:
$ sudo koha-shell -c "perl \
/home/vagrant/kohaclone/misc/cronjobs/process_message_queue.pl -v \
--type=sms" kohadev
This should give the following error: "Option type does not take an argument".
Apply the patch and run the same command again. This should not give an
error.
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 8aa86cdf2d5e0dbda7d21394e52f37ba17a8064c
Author: Olli-Antti Kivilahti <olli-antti.kivilahti at helsinki.fi>
Date: Wed Oct 3 11:24:38 2018 +0300
Bug 21480: misc/translator/translate does not work with perl 5.26
Perl 5.26 (or earlier) introduced a security feature, where implicitly
including the program directory as a Perl library directory no longer
happens (perl -I. ).
This causes translate to fail because it cannot find the *.pm -files in
it's own directory.
This patch adds the familiar mantra
use lib $FindBin::Bin;
to the relevant scripts.
To test:
1. Install Ubuntu18.04 or something else with Perl 5.26
2. Install Koha (we use the dev-install)
3. cd $KOHA_PATH/misc/translator/
4. perl translate create fi-FI
5. Observe problems with missing modules.
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Cannot recreate the issue right now but the changes make sense.
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit b4d8d13f14a7022e603ac30dd8cee0605e9d269d
Author: David Gustafsson <david.gustafsson at ub.gu.se>
Date: Tue Oct 2 13:37:26 2018 +0200
Bug 21471: (bug 21184 follow-up) Misspelled variable in _get_outstanding_holds
Misspelled variable causes _get_outstanding_holds to crash
if patron is queued on biblio level
Caused by
commit 62a075987af70ec5ed3665fe662adb31a17fdde4
Bug 21184: Replace C4::Items::GetBarcodeFromItemnumber calls
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 16fe5d7f30ede8147cb946095da9d529d057c789
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Sat Sep 29 11:26:25 2018 -0300
Bug 21418: Remove shelfoff which is not used
No need to add a new line to escape this variable that is never used,
better to remove it
`git grep shelfoff` will prove that it is not used anywhere else.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 6b053546add6fa9d002d757e5b493e68506e5290
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Sat Sep 29 11:24:19 2018 -0300
Bug 21418: Html escape the 2 variables
We should be on the safe side without this patch because shelfnumber and
type comes from the DB and are integer or varchar. It may be better to
show good examples to start, and escape everything anyway.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit b313d7c98f6d753caa18cc572ec355f16c4367b1
Author: Owen Leonard <oleonard at myacpl.org>
Date: Wed Sep 26 17:54:28 2018 +0000
Bug 21418: Incorrectly filtered markup in staff client lists
This patch removes the "|html" filter from some variable declarations in
the template used to display the list of lists in the staff client.
To test you should have at least one list. Apply the patch and go to
Lists.
In the table of lists, the "Edit" and "Delete" buttons should look
correct and work correctly.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 7fbd50e3aa07e46f0558d4f52231896937c998bc
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Oct 1 18:05:44 2018 -0300
Bug 21432: (bug 20899 follow-up) Fix patron's name display for deleted patrons
Template process failed: undef error - DBIC result _type isn't of the
_type Borrower at
/home/vagrant/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt
line 54.
Koha::Old::Checkout->patron should return undef if the patron record has
been removed.
Test plan:
- Check 2 items out on the same bibliographic record
- Check them in
- Delete the patron's record of one of the issuer (Is this word really
exist?)
- View the checkout history for this bib record (Home › Catalog ›
Checkout history)
=> Without this patch you get the error
=> With this patch applied one of the "Patron" cells will be empty
Signed-off-by: Claudio <costalc at gmail.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Matcher.pm | 2 +-
C4/Reserves.pm | 16 +-
C4/SIP/ILS/Patron.pm | 2 +-
Koha.pm | 2 +-
Koha/{Club/Template.pm => CirculationRule.pm} | 57 +-
Koha/CirculationRules.pm | 177 +
Koha/Old/Checkout.pm | 1 +
Koha/Schema/Result/Branch.pm | 19 +-
Koha/Schema/Result/BranchBorrowerCircRule.pm | 11 +-
Koha/Schema/Result/Category.pm | 19 +-
Koha/Schema/Result/CirculationRule.pm | 185 +
Koha/Schema/Result/DefaultBorrowerCircRule.pm | 11 +-
Koha/Schema/Result/Itemtype.pm | 19 +-
.../Plugin/{ItemTypes.pm => CirculationRules.pm} | 30 +-
Koha/Template/Plugin/KohaPlugins.pm | 56 +
admin/smart-rules.pl | 80 +-
debian/scripts/koha-create | 2 -
debian/scripts/koha-translate | 1 -
docs/history.txt | 1 +
installer/data/mysql/kohastructure.sql | 22 +-
installer/data/mysql/updatedatabase.pl | 43 +
.../prog/en/includes/doc-head-close.inc | 3 +
.../prog/en/includes/intranet-bottom.inc | 2 +
koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 1 +
.../prog/en/modules/admin/smart-rules.tt | 14 +-
.../prog/en/modules/catalogue/issuehistory.tt | 6 +-
.../virtualshelves/tables/shelves_results.tt | 29 +-
.../bootstrap/en/includes/doc-head-close.inc | 2 +-
misc/cronjobs/process_message_queue.pl | 2 +-
misc/translator/LangInstaller.pm | 24 +-
misc/translator/Makefile | 7 -
misc/translator/TmplTokenizer.pm | 2 +-
misc/translator/po/am-Ethi-staff-help.po |19876 ----------------
misc/translator/po/ar-Arab-staff-help.po |22819 ------------------
misc/translator/po/as-IN-staff-help.po |19876 ----------------
misc/translator/po/az-AZ-staff-help.po |20274 ----------------
misc/translator/po/be-BY-staff-help.po |20329 ----------------
misc/translator/po/bg-Cyrl-staff-help.po |19876 ----------------
misc/translator/po/bn-IN-staff-help.po |19877 ----------------
misc/translator/po/ca-ES-staff-help.po |19875 ----------------
misc/translator/po/cs-CZ-staff-help.po |23378 -------------------
misc/translator/po/cy-GB-staff-help.po |19876 ----------------
misc/translator/po/da-DK-staff-help.po |22687 ------------------
misc/translator/po/de-CH-staff-help.po |24286 -------------------
misc/translator/po/de-DE-staff-help.po |24285 -------------------
misc/translator/po/el-GR-staff-help.po |23949 -------------------
misc/translator/po/en-GB-staff-help.po |22384 ------------------
misc/translator/po/en-NZ-staff-help.po |23625 -------------------
misc/translator/po/eo-staff-help.po |19876 ----------------
misc/translator/po/es-ES-staff-help.po |24244 -------------------
misc/translator/po/eu-staff-help.po |23600 -------------------
misc/translator/po/fa-Arab-staff-help.po |22204 ------------------
misc/translator/po/fi-FI-staff-help.po |23255 -------------------
misc/translator/po/fo-FO-staff-help.po |19887 ----------------
misc/translator/po/fr-CA-staff-help.po |23984 -------------------
misc/translator/po/fr-FR-staff-help.po |24390 --------------------
misc/translator/po/ga-staff-help.po |19876 ----------------
misc/translator/po/gl-staff-help.po |19874 ----------------
misc/translator/po/he-Hebr-staff-help.po |19873 ----------------
misc/translator/po/hi-staff-help.po |23007 ------------------
misc/translator/po/hr-HR-staff-help.po |20198 ----------------
misc/translator/po/hu-HU-staff-help.po |20106 ----------------
misc/translator/po/hy-Armn-staff-help.po |23893 -------------------
misc/translator/po/ia-staff-help.po |19876 ----------------
misc/translator/po/id-ID-staff-help.po |19881 ----------------
misc/translator/po/iq-CA-staff-help.po |19876 ----------------
misc/translator/po/is-IS-staff-help.po |19880 ----------------
misc/translator/po/it-IT-staff-help.po |23900 -------------------
misc/translator/po/iu-CA-staff-help.po |19876 ----------------
misc/translator/po/ja-Jpan-JP-staff-help.po |19883 ----------------
misc/translator/po/ka-staff-help.po |19876 ----------------
misc/translator/po/km-KH-staff-help.po |19876 ----------------
misc/translator/po/kn-Knda-staff-help.po |19884 ----------------
misc/translator/po/ko-Kore-KP-staff-help.po |21049 -----------------
misc/translator/po/ku-Arab-staff-help.po |21952 ------------------
misc/translator/po/lo-Laoo-staff-help.po |19877 ----------------
misc/translator/po/mi-NZ-staff-help.po |19873 ----------------
misc/translator/po/ml-staff-help.po |19876 ----------------
misc/translator/po/mon-staff-help.po |20148 ----------------
misc/translator/po/mr-staff-help.po |19888 ----------------
misc/translator/po/ms-MY-staff-help.po |20000 ----------------
misc/translator/po/my-staff-help.po |19876 ----------------
misc/translator/po/nb-NO-staff-help.po |20533 ----------------
misc/translator/po/ne-NE-staff-help.po |19876 ----------------
misc/translator/po/nl-BE-staff-help.po |20554 -----------------
misc/translator/po/nl-NL-staff-help.po |19904 ----------------
misc/translator/po/nn-NO-staff-help.po |20071 ----------------
misc/translator/po/oc-staff-help.po |23982 -------------------
misc/translator/po/pbr-staff-help.po |19876 ----------------
misc/translator/po/pl-PL-staff-help.po |23466 -------------------
misc/translator/po/prs-staff-help.po |19876 ----------------
misc/translator/po/pt-BR-staff-help.po |23832 -------------------
misc/translator/po/pt-PT-staff-help.po |23893 -------------------
misc/translator/po/ro-RO-staff-help.po |20547 -----------------
misc/translator/po/ru-RU-staff-help.po |20313 ----------------
misc/translator/po/rw-RW-staff-help.po |19876 ----------------
misc/translator/po/sd-PK-staff-help.po |19876 ----------------
misc/translator/po/sk-SK-staff-help.po |23576 -------------------
misc/translator/po/sl-SI-staff-help.po |19876 ----------------
misc/translator/po/sq-AL-staff-help.po |19880 ----------------
misc/translator/po/sr-Cyrl-staff-help.po |19876 ----------------
misc/translator/po/sv-SE-staff-help.po |23653 -------------------
misc/translator/po/sw-KE-staff-help.po |19874 ----------------
misc/translator/po/ta-LK-staff-help.po |19876 ----------------
misc/translator/po/ta-staff-help.po |19878 ----------------
misc/translator/po/tet-staff-help.po |20150 ----------------
misc/translator/po/th-TH-staff-help.po |19876 ----------------
misc/translator/po/tl-PH-staff-help.po |19878 ----------------
misc/translator/po/tr-TR-staff-help.po |23948 -------------------
misc/translator/po/tvl-staff-help.po |19876 ----------------
misc/translator/po/uk-UA-staff-help.po |20486 ----------------
misc/translator/po/ur-Arab-staff-help.po |19876 ----------------
misc/translator/po/vi-VN-staff-help.po |23154 -------------------
misc/translator/po/zh-Hans-CN-staff-help.po |20881 -----------------
misc/translator/po/zh-Hans-TW-staff-help.po |20930 -----------------
misc/translator/text-extract.pl | 35 -
misc/translator/text-extract2.pl | 167 -
misc/translator/tmpl_process3.pl | 3 +
misc/translator/translate | 3 +
misc/translator/xgettext.pl | 6 +-
t/db_dependent/Holds.t | 30 +-
t/db_dependent/Koha/Checkouts.t | 30 +-
t/db_dependent/Koha/CirculationRules.t | 237 +
t/db_dependent/Koha/Template/Plugin/KohaPlugins.t | 6 +-
t/db_dependent/Plugins.t | 2 +
t/lib/Koha/Plugin/Test.pm | 10 +
126 files changed, 1018 insertions(+), 1753264 deletions(-)
copy Koha/{Club/Template.pm => CirculationRule.pm} (55%)
create mode 100644 Koha/CirculationRules.pm
create mode 100644 Koha/Schema/Result/CirculationRule.pm
copy Koha/Template/Plugin/{ItemTypes.pm => CirculationRules.pm} (53%)
delete mode 100644 misc/translator/Makefile
delete mode 100644 misc/translator/po/am-Ethi-staff-help.po
delete mode 100644 misc/translator/po/ar-Arab-staff-help.po
delete mode 100644 misc/translator/po/as-IN-staff-help.po
delete mode 100644 misc/translator/po/az-AZ-staff-help.po
delete mode 100644 misc/translator/po/be-BY-staff-help.po
delete mode 100644 misc/translator/po/bg-Cyrl-staff-help.po
delete mode 100644 misc/translator/po/bn-IN-staff-help.po
delete mode 100644 misc/translator/po/ca-ES-staff-help.po
delete mode 100644 misc/translator/po/cs-CZ-staff-help.po
delete mode 100644 misc/translator/po/cy-GB-staff-help.po
delete mode 100644 misc/translator/po/da-DK-staff-help.po
delete mode 100644 misc/translator/po/de-CH-staff-help.po
delete mode 100644 misc/translator/po/de-DE-staff-help.po
delete mode 100644 misc/translator/po/el-GR-staff-help.po
delete mode 100644 misc/translator/po/en-GB-staff-help.po
delete mode 100644 misc/translator/po/en-NZ-staff-help.po
delete mode 100644 misc/translator/po/eo-staff-help.po
delete mode 100644 misc/translator/po/es-ES-staff-help.po
delete mode 100644 misc/translator/po/eu-staff-help.po
delete mode 100644 misc/translator/po/fa-Arab-staff-help.po
delete mode 100644 misc/translator/po/fi-FI-staff-help.po
delete mode 100644 misc/translator/po/fo-FO-staff-help.po
delete mode 100644 misc/translator/po/fr-CA-staff-help.po
delete mode 100644 misc/translator/po/fr-FR-staff-help.po
delete mode 100644 misc/translator/po/ga-staff-help.po
delete mode 100644 misc/translator/po/gl-staff-help.po
delete mode 100644 misc/translator/po/he-Hebr-staff-help.po
delete mode 100644 misc/translator/po/hi-staff-help.po
delete mode 100644 misc/translator/po/hr-HR-staff-help.po
delete mode 100644 misc/translator/po/hu-HU-staff-help.po
delete mode 100644 misc/translator/po/hy-Armn-staff-help.po
delete mode 100644 misc/translator/po/ia-staff-help.po
delete mode 100644 misc/translator/po/id-ID-staff-help.po
delete mode 100644 misc/translator/po/iq-CA-staff-help.po
delete mode 100644 misc/translator/po/is-IS-staff-help.po
delete mode 100644 misc/translator/po/it-IT-staff-help.po
delete mode 100644 misc/translator/po/iu-CA-staff-help.po
delete mode 100644 misc/translator/po/ja-Jpan-JP-staff-help.po
delete mode 100644 misc/translator/po/ka-staff-help.po
delete mode 100644 misc/translator/po/km-KH-staff-help.po
delete mode 100644 misc/translator/po/kn-Knda-staff-help.po
delete mode 100644 misc/translator/po/ko-Kore-KP-staff-help.po
delete mode 100644 misc/translator/po/ku-Arab-staff-help.po
delete mode 100644 misc/translator/po/lo-Laoo-staff-help.po
delete mode 100644 misc/translator/po/mi-NZ-staff-help.po
delete mode 100644 misc/translator/po/ml-staff-help.po
delete mode 100644 misc/translator/po/mon-staff-help.po
delete mode 100644 misc/translator/po/mr-staff-help.po
delete mode 100644 misc/translator/po/ms-MY-staff-help.po
delete mode 100644 misc/translator/po/my-staff-help.po
delete mode 100644 misc/translator/po/nb-NO-staff-help.po
delete mode 100644 misc/translator/po/ne-NE-staff-help.po
delete mode 100644 misc/translator/po/nl-BE-staff-help.po
delete mode 100644 misc/translator/po/nl-NL-staff-help.po
delete mode 100644 misc/translator/po/nn-NO-staff-help.po
delete mode 100644 misc/translator/po/oc-staff-help.po
delete mode 100644 misc/translator/po/pbr-staff-help.po
delete mode 100644 misc/translator/po/pl-PL-staff-help.po
delete mode 100644 misc/translator/po/prs-staff-help.po
delete mode 100644 misc/translator/po/pt-BR-staff-help.po
delete mode 100644 misc/translator/po/pt-PT-staff-help.po
delete mode 100644 misc/translator/po/ro-RO-staff-help.po
delete mode 100644 misc/translator/po/ru-RU-staff-help.po
delete mode 100644 misc/translator/po/rw-RW-staff-help.po
delete mode 100644 misc/translator/po/sd-PK-staff-help.po
delete mode 100644 misc/translator/po/sk-SK-staff-help.po
delete mode 100644 misc/translator/po/sl-SI-staff-help.po
delete mode 100644 misc/translator/po/sq-AL-staff-help.po
delete mode 100644 misc/translator/po/sr-Cyrl-staff-help.po
delete mode 100644 misc/translator/po/sv-SE-staff-help.po
delete mode 100644 misc/translator/po/sw-KE-staff-help.po
delete mode 100644 misc/translator/po/ta-LK-staff-help.po
delete mode 100644 misc/translator/po/ta-staff-help.po
delete mode 100644 misc/translator/po/tet-staff-help.po
delete mode 100644 misc/translator/po/th-TH-staff-help.po
delete mode 100644 misc/translator/po/tl-PH-staff-help.po
delete mode 100644 misc/translator/po/tr-TR-staff-help.po
delete mode 100644 misc/translator/po/tvl-staff-help.po
delete mode 100644 misc/translator/po/uk-UA-staff-help.po
delete mode 100644 misc/translator/po/ur-Arab-staff-help.po
delete mode 100644 misc/translator/po/vi-VN-staff-help.po
delete mode 100644 misc/translator/po/zh-Hans-CN-staff-help.po
delete mode 100644 misc/translator/po/zh-Hans-TW-staff-help.po
delete mode 100755 misc/translator/text-extract.pl
delete mode 100755 misc/translator/text-extract2.pl
create mode 100644 t/db_dependent/Koha/CirculationRules.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list