[koha-commits] main Koha release repository branch master updated. v3.16.00-883-g4dc30d4
Git repo owner
gitmaster at git.koha-community.org
Fri Oct 31 19:50:54 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 4dc30d48ad2ef8f5705b2a8064f2c7c5b9528284 (commit)
via 1d17e36e366167db25caed5dcf4b2906cc84b241 (commit)
via 85489f7bdfe588301d87cc6d5313fe1be3b4e337 (commit)
via bc9d12e68ffa846f7a7a8dba5c98752398c2c257 (commit)
via b1dc52395b280b8f244cbc59e5253d5e45137b17 (commit)
from b61ebfd0fa3c8081a52c82ddc34d0cd3c0550766 (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 4dc30d48ad2ef8f5705b2a8064f2c7c5b9528284
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Oct 10 09:04:27 2014 -0400
Bug 13065 - Receive shipment error message incorrectly styled
If there is an error during the receive shipment process the error
message is incorrectly styled. This patch fixes it.
To test you can trigger the error by accessing the page with incorrect
or missing parameters:
/cgi-bin/koha/acqui/parcels.pl?op=confirm
This should trigger the message. Apply the patch and confirm that the
error is now styled consistently with others in the staff client.
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Small template change, works as described.
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 1d17e36e366167db25caed5dcf4b2906cc84b241
Author: Owen Leonard <oleonard at myacpl.org>
Date: Wed Oct 29 11:17:56 2014 -0400
Bug 643 [Template follow-up] Allow override of 'debarred' status
This minor followup makes two changes:
- Replaced instances of "Debarment" with "Restriction"
- Moved the override button into the block where the "View restrictions"
button is, making the section slightly more compact.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Some small template changes, no problems found.
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 85489f7bdfe588301d87cc6d5313fe1be3b4e337
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Tue Sep 23 10:12:12 2014 -0400
Bug 643: QA Followup - server-side verification of permissions
Only allow $force_allow=1 if the logged in user has permissions.
TEST PLAN
---------
Attempt to intentionally override the checkout by passing an
appropriately handcrafted URL.
-- Regardless of the force_allow value, it should be not allowed
for those lacking the force_checkout permission.
NOTE: I didn't test this. I figured Marc Veron could do that. :)
(Sorry, couldn't easily get git bz to work with the accent)
Signed-off-by: Nick Clemens <nick at quecheelibrary.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit bc9d12e68ffa846f7a7a8dba5c98752398c2c257
Author: Marc Véron <veron at veron.ch>
Date: Tue Jul 29 21:46:26 2014 +0200
Bug 643: Followup: Display override button only if issuing staff member has force_checkout permission
To test:
Apply first patch
Apply this patch
Log in as superlibrarian
Go to Home > Patrons > Set permissions for issuing staff member
Disable circulate - force_checkout
Log in as issuing staff member
Try to checkout to a debarred patron
=> should not be possible
Log in again as superlibrarian
Enable circulate - force_checkout for issuing staff member
Log in as issuing staff_member
Try to checkout to a debarred person
=> You should get the button 'Override debarment temporarily'
Signed-off-by: Aleisha <aleishaamohia at hotmail.com>
Signed-off-by: Nick Clemens <nick at quecheelibrary.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit b1dc52395b280b8f244cbc59e5253d5e45137b17
Author: Pasi Kallinen <pasi.kallinen at pttk.fi>
Date: Thu May 22 14:38:33 2014 +0300
Bug 643: Allow override of 'debarred' status
Add a button to temporarily override patron debarment.
To test:
1) Go to patron check out page
2) If patron has been debarred (eg. due to having fees),
there is no way to check out to that patron.
3) Apply patch
4) A debarred patron check out page now has a button for
"Override debarment temporarily" - clicking on it
should allow checking out to that patron.
Signed-off-by: Aleisha <aleishaamohia at hotmail.com>
Rebased because patch did not apply
Signed-off-by: Aleisha <aleishaamohia at hotmail.com>
Signed-off-by: Nick Clemens <nick at quecheelibrary.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Tested with/without force_checkout and superlibrarian permission.
Also checked crafting a URL is no longer working.
No regressions found.
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
-----------------------------------------------------------------------
Summary of changes:
circ/circulation.pl | 23 ++++++++++++++++----
.../intranet-tmpl/prog/en/modules/acqui/parcels.tt | 2 +-
.../prog/en/modules/circ/circulation.tt | 23 ++++++++++++++++++++
3 files changed, 43 insertions(+), 5 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list