[koha-commits] main Koha release repository branch master updated. v3.18.00-547-g89a3ef5
Git repo owner
gitmaster at git.koha-community.org
Tue Mar 31 15:59:42 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 89a3ef5c5a1658bead838789f8b4c2857583217f (commit)
via 482f2f31a8d4b13ee5bbc3fb211048056e11f090 (commit)
via 002b79c200f03adc162a5f59b988e8eb6c65e229 (commit)
via e1cdb4ebfa9e00850566a01de2719ff8daa9aee0 (commit)
via 316485b1c4bb1cfa4c0de19e857e692d34351234 (commit)
via b721b6f9f3b8eb65a929ca0605216b58f8f87996 (commit)
via eb2d7db6555abf1a52f8ce96c0370ec09c32bca8 (commit)
via fae32e22ef6fc4f9b02d4fb804e722b9db09cf09 (commit)
via 3adddd3410acf45874b7a154c2700f3f4b2e7f4b (commit)
via 4c4c870dfee59ebe6386dbd8a7b75a55f75217f9 (commit)
via 93addad23a2bccb41e2f56759d4dbde2a78db7de (commit)
via 792b0f764e1f0641b33ff3dbbe6f99e91109af9e (commit)
via ad2ead21f6f02678f620eab1ed081b27a22ccfb7 (commit)
via 2e4b574074ad8f66908cd22b466ba7a991696686 (commit)
via 934de70eec747f901904721fc12024051cf52f4c (commit)
via 0dd8e0dbd0163b1d96a560b467754c68ab3211b6 (commit)
via 886d02d8b705ecbea35d5e390d59f225c0a4f44b (commit)
from 7fa67b2f83f418df0923caaeec444b6a8f728b21 (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 89a3ef5c5a1658bead838789f8b4c2857583217f
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Wed Mar 18 23:31:42 2015 +0100
Bug 13869: Wrong capitalization of 'Save Report' in guided reports
On the last step of saving a new guided report to the database,
the button is labelled 'Save Report', but should be 'Save report'.
To test:
- Create a new guided report from the reports page
- Check on the very last step, when saving the report to the
database, the button is labelled 'Save Report'
- With the patch applied, this reads 'Save report' instead
http://bugs.koha-community.org/show_bug.cgi?id=13868
Works as expected.
Signed-off-by: Marc Veron <veron at veron.ch>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Safe change. Script uses the "phase" variable which remains "Save Report"
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 482f2f31a8d4b13ee5bbc3fb211048056e11f090
Author: Thomas <tomsStudy at gmail.com>
Date: Fri Jan 23 12:19:48 2015 +0000
Bug 13531 - Follow up
Add logging of errors.
Signed-off-by: Magnus Enger <magnus at enger.priv.no>
More errors are indeed showing up in the log.
(I took the liberty of changing the commit message a little bit.)
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 002b79c200f03adc162a5f59b988e8eb6c65e229
Author: Thomas <tomsStudy at gmail.com>
Date: Wed Jan 14 20:20:36 2015 +0000
Bug 13531: QA follow up
A minor QA comment.
::: misc/migration_tools/bulkmarcimport.pl
@@ +271,5 @@
> my ( $error, $results, $totalhits ) = C4::Search::SimpleSearch( $query, 0, 3, [$server] );
> + # changed to warn so able to continue with one broken record
> + if ( defined $error ) {
> + warn "unable to search the database for duplicates : $error";
> + next;
For consistency with the rest of the script, should this perhaps be:
next RECORD;
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit e1cdb4ebfa9e00850566a01de2719ff8daa9aee0
Author: Thomas <tomsStudy at gmail.com>
Date: Tue Jan 13 03:28:41 2015 +0000
Bug 13531 - bulkmarcimport bombs if no match is found Changed the die statment to a warn allowing the import to continue.
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 316485b1c4bb1cfa4c0de19e857e692d34351234
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Wed Feb 25 10:44:00 2015 +0100
Bug 13740: Fix null vs not null in the query
The previous patch did not work, only patrons *with* guanrantees were
deleted!
Signed-off-by: Koha Team AMU <koha.aixmarseille at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit b721b6f9f3b8eb65a929ca0605216b58f8f87996
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Fri Feb 20 16:23:50 2015 +0100
Bug 13740: Remove the NOT NULL clause in GetBorrowersToExpunge
C4::Borrowers::GetBorrowersToExpunge should not use a "NOT IN", it is
not efficient at all.
With only 1 guarantor and more than 136k patrons, the not in clause in
this subroutine takes ages:
mysql> select count(*) FROM borrowers where borrowernumber NOT IN
(SELECT guarantorid FROM borrowers WHERE guarantorid IS NOT NULL AND
guarantorid <> 0) ;
[...]
not ended after 5min
With the query modified by this patch, the results come after 1 sec :)
Test plan:
Verify the delete_patrons.pl cronjob or the cleanborrowers tools work as
before.
Especially with guarantors.
Signed-off-by: Brendan Gallagher <brendan at bywatersolutions.com>
Signed-off-by: Koha Team AMU <koha.aixmarseille at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit eb2d7db6555abf1a52f8ce96c0370ec09c32bca8
Author: Magnus Enger <magnus at enger.priv.no>
Date: Thu Mar 5 13:27:08 2015 +0100
Bug 12291:_(followup) Replace the acronym HTML tag with abbr
This patch replaces the last occurrence of <acronym> with <abbr>.
To test:
- Apply this patch on top of the first patch and check that
"grep -r "<acronym" koha-tmpl/*/*/en/*" does not return any hits.
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit fae32e22ef6fc4f9b02d4fb804e722b9db09cf09
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Fri Feb 20 11:42:31 2015 +0100
Bug 12291: Replace acronym with tag at the OPAC
On the OPAC authentification page, the acronym tag is used, but
deprecated.
It should be replaced with abbr:
http://www.w3.org/wiki/HTML/Elements/acronym
Test plan:
Enable the CAS authentification and verify the tags have correctly been
replaced.
Signed-off-by: Magnus Enger <magnus at enger.priv.no>
Befor the patch, "grep -r "<acronym" koha-tmpl/*/*/en/*" shows 4 occurences of
<acronym>, 3 related to CAS. After the patch, the same grep shows 1 remaining
<acronym>, in acqui/parcels.tt. I sign off this patch and will provide a
followup for the last occurrence.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 3adddd3410acf45874b7a154c2700f3f4b2e7f4b
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Wed Mar 25 15:51:00 2015 +0100
Bug 3873: follow-up for all other pages
This should fix the issue on other pages.
Test plan:
Try to download and export the basket (intranet+opac sides).
Re-tested for errors in comment #5, they do not longer appear.
Signed-off-by: Marc Veron <veron at veron.ch>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 4c4c870dfee59ebe6386dbd8a7b75a55f75217f9
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Wed Mar 25 09:39:02 2015 +0100
Bug 3873: Avoid software error if the cart contains a deleted record
If a record is placed in the basket and deleted, the basket view
exploded with:
Can't use an undefined value as an ARRAY reference at
/home/koha/src/basket/basket.pl line 73.
Test plan:
1/ Add some records to the basket
2/ Delete one of them
3/ Look at your basket
It should not exploded
Note that the number of items in the basket is now wrong.
Works as expected.
Signed-off-by: Marc Veron <veron at veron.ch>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 93addad23a2bccb41e2f56759d4dbde2a78db7de
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Tue Feb 10 20:30:23 2015 -0300
Bug 13695: Add ISBD export option for the OPAC cart and lists
This patch adds the option to download records from the cart, and
lists in the ISBD format from the OPAC.
To test (cart):
- Apply the patch
- Add several records to your OPAC cart.
- Go to your cart, and choose 'Download'
=> SUCCESS: There's an ISBD option
- Dowload and open the exported records
=> SUCCESS: The file contains the ISBD format for the records on the cart
To test (lists):
- Add several records to a list (i did it from the cart ;-))
- Open the list
- Choose 'Download list'
=> SUCCESS: There's an ISBD option
- Download and open the exported records
=> SUCCESS: The file contains the ISBD format for the records on the list.
- Sign off :-D
Sponsored-by: Orex Digital
Signed-off-by: Brendan Gallagher <brendan at bywatersolutions.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 792b0f764e1f0641b33ff3dbbe6f99e91109af9e
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Tue Feb 10 20:24:22 2015 -0300
Bug 13695: Add ISBD export option to OPAC (detail)
This patch adds the option to export a record (from within the
OPAC record detail page) in the ISBD format.
To test:
- Enable ISBD on the OpacExportOptions syspref
- Look for a record on your opac
- On the detail page, notice there's a new ISBD option for 'Save record'
- Choose ISBD
=> SUCCESS: a file containing the ISBD format for the record is downloaded
Sponsored-by: Orex Digital
Signed-off-by: Brendan Gallagher <brendan at bywatersolutions.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit ad2ead21f6f02678f620eab1ed081b27a22ccfb7
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Tue Feb 10 20:16:16 2015 -0300
Bug 13695: Add ISBD to OpacExportOptions
This patch adds 'isbd' as an export option on the system preferences.
Note this patch doesn't add the feature.
To test:
- On master, search for the OpacExportOptions syspref
=> FAIL: There is no ISBD option.
- Apply the patch
- Search for the OpacExportOptions syspref
=> SUCCESS: There is a new ISBD option.
Sponsored-by: Orex Digital
Signed-off-by: Brendan Gallagher <brendan at bywatersolutions.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 2e4b574074ad8f66908cd22b466ba7a991696686
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Thu Mar 26 10:23:26 2015 +0100
Bug 5844: Avoid strings cut on unhighlighing
If a user is searching for several words and that one is contained in
another ( "mag ma" ), some characters are cut (removed from the DOM!).
To reproduce:
1/ search for "mag ma m"
2/ The result page contains "Magazine"
3/ "Mag" is highlighted
4/ Click on the "Unhighlight" link
5/ The "Magazine" words become "azine", "Mag" has been cut.
There is no way to show these characters again.
Test plan:
1/ Confirm the bad behavior without this patch
2/ Apply this patch
3/ search for "mag ma m"
4/ The result page contains "Magazine"
5/ "Mag" is highlighted
6/ Click on the "Unhighlight" link
7/ strings are unhighlighted and still in the DOM :)
Note that the Highlight link won't work very well (only "a" will be
highlighted, but considered as minor since this did not work before the
patch neither).
Followed test plan. Strings are no longer cut when unhiglighted.
Signed-off-by: Marc Veron <veron at veron.ch>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 934de70eec747f901904721fc12024051cf52f4c
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Tue Mar 24 17:30:02 2015 +0100
Bug 3969: Fix funds search
The funds search does not work at all.
On the budget and the budget plan page, the library dropdown list is
empty.
Test plan:
On the budget, the budget plan and the fund pages, confirm that you are
able to search a fund by code (or name) and the library dropdown list is
correctly filled.
Tested with several combinations. Works as expected.
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Tested various combinations, no problems found.
Passes tests and QA script.
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 0dd8e0dbd0163b1d96a560b467754c68ab3211b6
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Thu Mar 26 09:30:11 2015 +0100
Bug 5002: Show all patron categories after insert
+ wording changes.
How I tested:
- edit an existing patron category
- save the change
- redirect is to the categories table - it shows all categories OK
- wording OK as well
Signed-off-by: Marc Veron <veron at veron.ch>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 886d02d8b705ecbea35d5e390d59f225c0a4f44b
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Tue Mar 24 12:35:56 2015 +0100
Bug 5002: Display messages on adding/deleting patron category
There are no messages on adding and deleting patron category.
If an error occurs and the data is not inserted, the interface does not
alert the user.
This patch adds a message block to alert the user if something wrong
happened.
Test plan:
1/ Create a patron category PATCAT. You should get a confirmation
message.
2/ Try to create another patron category with the same code. You should
get an error message
3/ Delete the patron category PATCAT. You should get a confirmation
message.
Confirm there is no regression on this form (try update an existing
patron category too).
Followed test plan, works as expected.
Signed-off-by: Marc Veron <veron at veron.ch>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Members.pm | 13 ++++--
admin/aqbudgetperiods.pl | 3 ++
admin/aqbudgets.pl | 18 +++-----
admin/aqplan.pl | 4 +-
admin/categorie.pl | 46 ++++++++++++--------
basket/basket.pl | 1 +
basket/downloadcart.pl | 1 +
basket/sendbasket.pl | 1 +
installer/data/mysql/sysprefs.sql | 2 +-
.../intranet-tmpl/prog/en/modules/acqui/parcels.tt | 2 +-
.../prog/en/modules/admin/categorie.tt | 40 ++++++++---------
.../prog/en/modules/admin/preferences/opac.pref | 1 +
.../en/modules/reports/guided_reports_start.tt | 2 +-
.../bootstrap/en/includes/opac-detail-sidebar.inc | 1 +
.../opac-tmpl/bootstrap/en/modules/opac-auth.tt | 6 +--
.../bootstrap/en/modules/opac-downloadcart.tt | 1 +
.../bootstrap/en/modules/opac-downloadshelf.tt | 1 +
.../lib/jquery/plugins/jquery.highlight-3.js | 8 +---
misc/migration_tools/bulkmarcimport.pl | 7 ++-
opac/opac-basket.pl | 1 +
opac/opac-downloadcart.pl | 16 +++++--
opac/opac-downloadshelf.pl | 14 ++++--
opac/opac-export.pl | 11 +++++
opac/opac-sendbasket.pl | 1 +
24 files changed, 126 insertions(+), 75 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list