[koha-commits] main Koha release repository branch master updated. v3.14.00-751-gb1e09cb
Git repo owner
gitmaster at git.koha-community.org
Thu Apr 17 18:15:02 CEST 2014
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 b1e09cb0fa900964200f224cad771d95062bc48d (commit)
via bc3f4d1c565a10330d87c067592a69fdd0d20620 (commit)
via 09e9641928b6885995d5faf0d0671541c5f4a43f (commit)
via d86b2a86457086aa6c7539a901a307947187d736 (commit)
via 9cb0f6750100771155ac9d9107b912907a68614f (commit)
via f5ca392317f09d904e76cc91376cf1b746b22e91 (commit)
via d5a976b1fa57e0fc3a1589eb405767d246ee2eb6 (commit)
via 695fdebdee802387f45505a1350120727d3e2f7f (commit)
via 5492d82bc2aa9c884fe67810ddb3cd08c83910fe (commit)
via f796d1002a39cd714433a219b35eefbce31b02d8 (commit)
from de81d7abe43f3c2eed327b52e212bc790b406961 (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 b1e09cb0fa900964200f224cad771d95062bc48d
Author: Owen Leonard <oleonard at myacpl.org>
Date: Wed Apr 9 12:15:56 2014 -0400
Bug 12058: make OverDrive search results page show cart, lists, and login links
The template for OverDrive search results in the Bootstrap OPAC doesn't
show the cart, lists, or login links because the template's checks of
related system preferences relies on [% USE Koha %], which is not
present. This patch adds it.
To test, enable the bootstrap theme and OverDrive integration
(OverDriveClientKey, etc.). Perform a search in the OPAC and click to
view results from your OverDrive library. Confirm that cart, lists, and
login links appear in the header.
Signed-off-by: Jesse Weaver <pianohacker at gmail.com>
Bug confirmed, and this patch fixes it.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit bc3f4d1c565a10330d87c067592a69fdd0d20620
Author: Galen Charlton <gmc at esilibrary.com>
Date: Thu Apr 17 16:09:40 2014 +0000
Bug 9448: (follow-up) prevent unauthorized operator from bypassing check on forgiving overdue fines
This patch adds a step to verify that an operator has the writeoff
permission before allowing them to forgive overdue fines during
checkin, which was possible if the operator manually added an
"exemptfines" URL parameter.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 09e9641928b6885995d5faf0d0671541c5f4a43f
Author: Galen Charlton <gmc at esilibrary.com>
Date: Thu Apr 17 15:48:17 2014 +0000
Bug 9448: DBRev 3.15.00.031
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit d86b2a86457086aa6c7539a901a307947187d736
Author: Galen Charlton <gmc at esilibrary.com>
Date: Thu Apr 17 15:46:57 2014 +0000
Bug 9448: (follow-up) tweak description of new permissions
"Fines and fees" is consistent with the description of the
main "updatecharges" permission; in some areas, "charges" by itself
can refer to loans, not fees.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 9cb0f6750100771155ac9d9107b912907a68614f
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Thu Apr 17 08:38:16 2014 -0400
Bug 9448: (QA Followup) Hide 'Forgive overdue charges' for returns if user does not have writeoff permission
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit f5ca392317f09d904e76cc91376cf1b746b22e91
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Thu Apr 17 07:51:58 2014 -0400
Bug 9448: (follow-up) rephrase permission description
Rephrases permission description a bit to make it clearer and easier to
translate.
Adds German descriptions as requested by katrin.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Passes QA script and all tests.
Tested with various permission combinations:
- superlibrarian
- updatecharges (full permission)
- only 'remaining permissions for updating charges'
It works as expected.
Note: I think we need a follow up to include the
'Forgive overdue charges' checkbox on the check in page
in the new permission.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit d5a976b1fa57e0fc3a1589eb405767d246ee2eb6
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Thu Mar 21 04:18:50 2013 -0700
Bug 9448: Add separate permission for writing off fees
Adds new sub-permissions to updatecharges, 'writeoff' for writing off
fees and 'remaining_permissions' for all other fee related activites.
Test plan:
1) Apply patch
2) Run updatedatabase.pl
3) Remove the 'writeoff' permission from your privileges
4) Attempt to write off a fee, you should not be able to
5) Re-add the 'writeoff' permission
6) Attempt to write off a fee, you should now be able to do so
Signed-off-by: Joel Sasse <jsasse at plumcreeklibrary.net>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 695fdebdee802387f45505a1350120727d3e2f7f
Author: Galen Charlton <gmc at esilibrary.com>
Date: Mon Apr 14 18:44:07 2014 +0000
Bug 12079: ensure that CheckReserves() includes reserve_id in its response
This patch modifies _Findgroupreserve so that its one caller,
CheckReserves(), would include the reserve_id field in the
hold request it returns.
Failure to include reserve_id in every circumstance resulted
in bug 11947. This patch is therefore a complementary fix for
that bug, but is not meant to preempt the direct fix for
that bug.
To test:
[1] Verify that t/db_dependent/Reserves.t passes.
[2] Verify that the following test plan taken from
the patch for bug 11947 works for this patch
*without* applying the patch for 11947:
* have a few borrowers, say 4.
* have a biblio with a single item (you can scale this up, it should
work just the same.)
* issue the item to borrower A
* have borrowers B, C, and D place a hold on the item
* return the item, acknowledge that it'll be put aside for B.
* view the holds on the item.
Without the patch:
* the hold priorities in the UI end up being "waiting, 2, 1" when they
should be "waiting, 1, 2".
* in the database "reserves" table, they're really "0, 2, 3" when they
should be "0, 1, 2".
With the patch:
* the hold priorities in the UI end up being "waiting, 1, 2"
* in the database, they're "0, 1, 2"
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Work as described. No koha-qa errors. Test pass
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 5492d82bc2aa9c884fe67810ddb3cd08c83910fe
Author: Galen Charlton <gmc at esilibrary.com>
Date: Thu Apr 17 15:31:33 2014 +0000
Bug 11484: (follow-up) standardize capitalization of "Z39.50"
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit f796d1002a39cd714433a219b35eefbce31b02d8
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Mon Jan 6 13:46:02 2014 -0500
Bug 11484: Add option to cleanup_database.pl to purge Z39.50 search records from reservoir
It would be good to be able to specifically target import records from
Z39.50 for cleanup.
Test Plan:
1) Apply this patch
2) Import one or more batch record sets into Koha
3) Perform some Z39.50 searches
4) Run this command: misc/cronjobs/cleanup_database.pl -v --z3950
5) Verify that only Z39.50 records were deleted
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Reserves.pm | 6 ++--
circ/returns.pl | 8 +++++
.../data/mysql/de-DE/mandatory/userpermissions.sql | 2 ++
.../data/mysql/en/mandatory/userpermissions.sql | 2 ++
.../data/mysql/es-ES/mandatory/userpermissions.sql | 2 ++
.../mysql/fr-FR/1-Obligatoire/userpermissions.sql | 2 ++
.../data/mysql/it-IT/necessari/userpermissions.sql | 2 ++
.../mysql/nb-NO/1-Obligatorisk/userpermissions.sql | 2 ++
.../data/mysql/pl-PL/mandatory/userpermissions.sql | 2 ++
.../ru-RU/mandatory/permissions_and_user_flags.sql | 2 ++
.../uk-UA/mandatory/permissions_and_user_flags.sql | 2 ++
installer/data/mysql/updatedatabase.pl | 8 +++++
.../intranet-tmpl/prog/en/modules/circ/returns.tt | 2 +-
.../intranet-tmpl/prog/en/modules/members/pay.tt | 4 +--
.../bootstrap/en/modules/opac-overdrive-search.tt | 1 +
kohaversion.pl | 2 +-
members/boraccount.pl | 2 +-
members/mancredit.pl | 2 +-
members/maninvoice.pl | 2 +-
members/pay.pl | 3 +-
members/paycollect.pl | 3 +-
members/printfeercpt.pl | 2 +-
members/printinvoice.pl | 2 +-
misc/cronjobs/cleanup_database.pl | 35 ++++++++++++++++++--
t/db_dependent/Reserves.t | 5 ++-
25 files changed, 88 insertions(+), 17 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list