[koha-commits] main Koha release repository branch master updated. v3.14.00-246-g917dad9
Git repo owner
gitmaster at git.koha-community.org
Tue Jan 7 05:18: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 917dad97a86dd4f8c23a07cea5e3294c9da88f07 (commit)
via 936f04fa471ea1be5731e02b8f6fa690f33a9e6a (commit)
via f173cafbb5be325eb34842ef63c239c22e23cdd8 (commit)
via d45c9a673b24b0240572a6ad3d25cf57c50a28c6 (commit)
from 9d2cd6771e616b46eda936ccdf76823e6f520617 (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 917dad97a86dd4f8c23a07cea5e3294c9da88f07
Author: Galen Charlton <gmc at esilibrary.com>
Date: Tue Jan 7 04:33:05 2014 +0000
Bug 10863: (follow-up) give limited circ operator way to proceed
This patch tweaks the checkout form so that if a circ operator
doesn't have the circulate/force_checkout permission, they are
presented with a button to continue on if they ran into a restriction
on the loan. Otherwise, there was no clear way to carry on, as the
item barcode field was disabled.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 936f04fa471ea1be5731e02b8f6fa690f33a9e6a
Author: Galen Charlton <gmc at esilibrary.com>
Date: Tue Jan 7 04:06:17 2014 +0000
Bug 10863: (follow-up) set correct description for manage_restrictions permission during upgrade
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit f173cafbb5be325eb34842ef63c239c22e23cdd8
Author: Galen Charlton <gmc at esilibrary.com>
Date: Tue Jan 7 04:02:42 2014 +0000
Bug 10863: DBRev 3.15.00.012
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit d45c9a673b24b0240572a6ad3d25cf57c50a28c6
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Wed Jun 5 14:37:38 2013 +0200
Bug 10863: Add 2 circulation permissions: force_checkout and lift_restriction
This patch adds 2 circulation permissions: force_checkout and
lift_restriction.
During upgrade, these two permission are added to existing staff
users that already have the base circulate permission.
force_checkout allows a librarian to force a checkout if a limitation
occurred.
lift_restriction allows a librarian to lift a restriction for a patron.
Test plan:
1/ Find a debarred patron and go on the checkout page. The "Lift
restriction" button should be present only if the logged librarian has
the lift_restriction permission.
2/ If the force_checkout permission is set, a librarian should be
allowed to check out in several cases:
- age restriction
- the item is issued to another patron
- the item is not for loan
- the patron has overdue items
- the item is lost
- the item is a high demand item
- the item is reserved
- another case ?
Signed-off-by: Cedric Vita <cedric.vita at dracenie.com>
Bug 10863: The force checkout permission should not affect high holds
- typo checkout => check out.
- the force checkout permission does not affect high holds.
Signed-off-by: Cedric Vita <cedric.vita at dracenie.com>
Bug 10863: Follow-up: Adding missing permissions to translated files
This patch adds the 2 new permissions to all remaining sample files.
If the permissions don't get installed, the problem is bigger than
having an English description.
Also adds back the question "Check out anyway?" for high demand items (HIGHHOLDS).
Test xt/permissions.t passes now.
Bug 10863: Rename lift_restriction with manage_restrictions
The pref manage_restrictions now takes into account "Lost card" and
"Gone no address" restrictions.
Test plan:
- log in with a user with manage_restrictions permission
- verify you can set/unset restrictions when editing a patron
- log in with a user without manage_restrictions permission
- verify you cannot set/unset restrictions when editing a patron
Signed-off-by: Mathieu Saby <mathieu.saby at univ-rennes2.fr>
Note: The AgeRestrictionOverride pref has to be set to "Allow" if you
want to override the age restriction, even if the new permission is set.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Passes koha-qa.pl, works as advertised
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
-----------------------------------------------------------------------
Summary of changes:
.../data/mysql/de-DE/mandatory/userpermissions.sql | 4 +-
.../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 | 27 +++++++++++
.../prog/en/includes/borrower_debarments.inc | 8 ++--
.../prog/en/modules/circ/circulation.tt | 49 ++++++++++++++++----
.../prog/en/modules/members/memberentrygen.tt | 16 +++++--
kohaversion.pl | 2 +-
14 files changed, 103 insertions(+), 19 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list