[koha-commits] main Koha release repository branch master updated. v3.14.00-230-g543e1dc
Git repo owner
gitmaster at git.koha-community.org
Sun Jan 5 00:09:20 CET 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 543e1dc6731d4a26b777223920bfe4037e7546dd (commit)
via 80fc94f86aab31e8b241cf713e6b10572a364693 (commit)
via 5cfa865aad2caabd76e361fcbbe8f6429941bad4 (commit)
via 78037c5573f70939077dd00f296c735b198e6124 (commit)
from 7f90a4fb27ca06bbe39174b555f96445682a0c28 (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 543e1dc6731d4a26b777223920bfe4037e7546dd
Author: Galen Charlton <gmc at esilibrary.com>
Date: Sat Jan 4 23:25:25 2014 +0000
Bug 11336: (follow-up) improve POD for _FixPriority()
This patch improves the POD for C4::Reserves::_FixPriority()
to (hopefully) describe its function thoroughly. It also
adjusts the call of _FixPriority() by CancelReserve() to
omit passing reserve_id, since by that point no row in
the reserves table for that request still exists.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 80fc94f86aab31e8b241cf713e6b10572a364693
Author: Galen Charlton <gmc at esilibrary.com>
Date: Sat Jan 4 22:45:29 2014 +0000
Bug 11336: (follow-up) correct change to POD for GetReserve()
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 5cfa865aad2caabd76e361fcbbe8f6429941bad4
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Sun Dec 29 13:57:33 2013 +0100
Bug 11336: (follow-up) fixing capitalization in templates
Fixes capitalization on the holds and check in page.
Changes are easy to spot using:
git diff HEAD^ --color-words=.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 78037c5573f70939077dd00f296c735b198e6124
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Fri Dec 13 17:42:55 2013 +0100
Bug 11336: update hold queue priorities correctly when deleting holds
In various places, deleting a hold request did not trigger recalculating
the priority of the other holds on the bib:
To reproduce the bug:
- select or create 2 users U1 and U2
- select or create an holdable item
- place on hold for both U1 and U2. U1 has priority 1 and U2 has
priority 2.
- delete the hold for U1
- go on circ/circulation.pl?borrowernumber=XXXX for U2 (or in the DB
directly) and verify the priority has not been set to 1
The issue is repeatable (at least) on these 2 pages:
* circ/circulation.pl?borrowernumber=XXXX (tab 'Holds', select "yes"
in the dropdown list and submit the form)
* reserve/request.pl?biblionumber=XXXX (click on the red cross)
Signed-off-by: Christopher Brannon <cbrannon at cdalibrary.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Reran my tests:
Preparations:
- Create holds for different patrons on a record:
* 1st - title level hold
* 2nd - item level hold
* 3rd - title level hold
* 4th - title level hold
- AllowOnShelfHolds = On/Allow (items were not checked out)
Tests:
Deleted holds from various pages, confirming bugs first,
then testing with applied patches. Reloading database
after each test.
1) Cancel holds from OPAC patron account
/cgi-bin/koha/opac-user.pl#opac-user-holds
- Cancel 4th - ok, before and after applying the patch
- Cancel 2nd - ok, after applying the patch
2) Cancel hold from holds tab on staff detail page
/cgi-bin/koha/reserve/request.pl?biblionumber=7
a) Setting priority to 'del', submitting with 'Update holds'
- Cancel first (1st) - ok, before and after
- Cancel hold in the middle (was 3rd) - ok, before and after
- Cancel last (was 4th) -ok, before and after
b) Using red X
- Repeating tests from a) - before the patch is applied holds
get totally 'out of order' - after applying the patch, it works
correctly
Additional tests done on this page:
- Change priority using up, down, to top, to bottom icons
- Change priority with 'toggle to lowest'
3) Cancel hold from the patron's account
a) Check out tab - Delete? Yes, 'Cancel marked holds'
/cgi-bin/koha/circ/circulation.pl?borrowernumber=X
- Cancel first (1st) - ok, after applying the patch
- Cancel hold in the middle (was 3rd) - ok, after applying the patch
- Cancel last (was 4th) - ok, after applying the patch
b) Details tab - Delete? yes, 'Cancel marked holds'
/cgi-bin/koha/members/moremember.pl?borrowernumber=X
- Cancel first (1st) - ok, after applying the patch
- Cancel hold in the middle (was 3rd) - ok, after applying the patch
- Cancel last (was 4th) - ok, after applying the patch
Without the patch, holds priorities get out of order.
Additional tests done:
- Check in one item to trigger first hold
- Check in one item to trigger second hold
- Check out first item
Priorities are kept while the item is waiting, when it's
checked out, priorities of remaining holds get reset correctly.
Conclusion:
Big improvement, no regressions found.
Passes all tests in t, xt and QA script.
Also: t/db_dependent/Holds.t
t/db_dependent/HoldsQueue.t
t/db_dependent/Reserves.t
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Reserves.pm | 106 +++++++++++---------
.../intranet-tmpl/prog/en/modules/circ/returns.tt | 2 +-
.../prog/en/modules/reserve/request.tt | 28 +++---
t/db_dependent/Holds.t | 70 ++++++++++++-
4 files changed, 143 insertions(+), 63 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list