[koha-commits] main Koha release repository branch master updated. v3.14.00-1112-ge56e27f
Git repo owner
gitmaster at git.koha-community.org
Mon May 5 03:58:31 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 e56e27f5640f246e9baaa871bd121e03c22a7772 (commit)
via 275e389afb9703504847e40dcd6567c883cf8a1a (commit)
via ed30c16dc2e26a63a9349060e80cd62b55017450 (commit)
via 626f6c63a14b2d58c1088e336d138997ae225b2f (commit)
via c1673f2db842d3d8f92df242878b9ef155e8efda (commit)
via 4db91211aa1a4a0a06d63315d6de043e5a93fa89 (commit)
via fd3985eb6c94e06007ec0af364ae672e766775b1 (commit)
via b1b0d88e114357a7bb4adb6d1a55c7dd767796c1 (commit)
via 25b2cd1c6526b10bc6a726c4ef8296b87a38de02 (commit)
via b1451ab1273bc8039d8b85c83422dc1c29db385d (commit)
via 6ae5a267bc011a0fbecb91f98192582ed868ffd2 (commit)
via 42c829837cef09fa5449ec415ec2926784830ddb (commit)
via 80b7a8153dca1bc8f97976e3686c6527766deef3 (commit)
from 53114f0b21cd2f80947bec44a04a7c30cf118e57 (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 e56e27f5640f246e9baaa871bd121e03c22a7772
Author: Galen Charlton <gmc at esilibrary.com>
Date: Mon May 5 02:12:40 2014 +0000
Bug 6739: (follow-up) tweak wording
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 275e389afb9703504847e40dcd6567c883cf8a1a
Author: Galen Charlton <gmc at esilibrary.com>
Date: Mon May 5 02:07:32 2014 +0000
Bug 6739: (follow-up) add unit tests for GetMemberDetails()->{is_expired}
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit ed30c16dc2e26a63a9349060e80cd62b55017450
Author: Galen Charlton <gmc at esilibrary.com>
Date: Mon May 5 02:00:36 2014 +0000
Bug 6739: (follow-up) update DBIC schema classes
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 626f6c63a14b2d58c1088e336d138997ae225b2f
Author: Galen Charlton <gmc at esilibrary.com>
Date: Mon May 5 01:57:56 2014 +0000
Bug 6739: (follow-up) do NOT activate new feature by default during upgrade
The previous behavior falls in the category of (arguably) buggy behavior
that nonetheless should not be silently changed on the folks who would
have to deal with patron complaints.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit c1673f2db842d3d8f92df242878b9ef155e8efda
Author: Galen Charlton <gmc at esilibrary.com>
Date: Mon May 5 01:57:34 2014 +0000
Bug 6739: DBRev 3.15.00.045
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 4db91211aa1a4a0a06d63315d6de043e5a93fa89
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Wed Jan 15 11:53:56 2014 +0100
Bug 6739: (follow-up) template changes for the bootstrap theme
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Passes QA script, t, xt and t/db_dependent/Members*.
Testing notes:
- Database update
* Changes to kohastructure match changes done by the updatedatabase
statement. Feature is activated by default!
* Ran database update succesfully.
* Note: Expired patrons are now blocked by default in new
AND in updated installations.
- System preference
* Verified system preference shows up correctly.
- Category configuration
* Add new patron category
* Edit existing patron category
* Delete patron category
* Check patron category summary table.
=> Verified all actions work as expected.
=> Verified chosen value for BlockExpiredPatronOpacActions
is always displayed and saved correctly.
* Note: The new value is missing from the summary table.
* Note: The new value is also not shown when deleting a patron
category.
- Check functionality
* Renew and place a hold for an NOT EXPIRED patron with
a) category: use syspref (default)
syspref: block (default)
b) category: use syspref (default)
syspref: don't block
c) category: block
syspref: don't block
d) category: block
syspref: block
e) category: don't block
sypref: block
f) category: don't block
syspref: don't block
Holds and renewals were always possible.
* Also verified that the warning from NotifyBorrowerDeparture
still shows up correctly.
* Verified holds and renewals are still blocked, when the
user has a restriction with a date in the future.
* Renew and place a hold for an EXPIRED patron with
a) category: use syspref (default)
syspref: block (default)
Holds and renewals blocked.
b) category: use syspref (default)
syspref: don't block
Holds an renewals possible.
c) category: block
syspref: don't block
Holds and renewals blocked.
d) category: block
syspref: block
Holds and renewals blocked.
e) category: don't block
sypref: block
Holds and renewals possible.
f) category: don't block
syspref: don't block
Holds and renewals possible.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit fd3985eb6c94e06007ec0af364ae672e766775b1
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Wed Jan 15 11:38:38 2014 +0100
Bug 6739: (follow-up) fix conflicts with some others bugs.
See comments 86 and 88. This patch fixes a bad conflict resolution in a
previous patch.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit b1b0d88e114357a7bb4adb6d1a55c7dd767796c1
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Sun Sep 22 16:20:19 2013 +0200
Bug 6739: (follow-up) yet more fixes
- Fixes a typo in one of the OPAC messages: "you account"
- Fixes the updatedatabase script to use 1 instead of yes for the
system preference default matching the sysprefs.sql file.
- Fixes capitalization "Don't Block" in system preference
description.
- Adding . to the end of the warning, when renewals are blocked.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 25b2cd1c6526b10bc6a726c4ef8296b87a38de02
Author: Fridolyn SOMERS <fridolyn.somers at biblibre.com>
Date: Thu Jul 11 12:39:16 2013 +0200
Bug 6739: (follow-up) more fixes
Some corrections :
- opac-reserve.tt : opening <p> instead of closing
- opac-user.tt : warnexpired was in database format, adds the use
of KohaDates template plugin
- opac-user.tt : duplicated TT test : [% IF ( BORROWER_INF.warnexpired ) %]
and [% ELSIF ( BORROWER_INF.warnexpired ) %], maybe a merge error
- opac-user.tt : <string> instead of <strong>, maybe for HTML 6 :-)
- opac-user.pl : adding dateformat var to template is already done by Auth.pm
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Passes all tests and QA script.
Testing notes:
- Database update
* Changes to kohastructure match changes done by the updatedatabase
statement. Feature is activated by default. Fixing 'yes' to be '1'
in a follow up.
* Ran database update succesfully.
* Note: Patrons are now blocked by default in new installations
AND in updated installations.
- System preference
* Verified system preference shows up correctly.
- Category configuration
* Add new patron category
* Edit existing patron category
* Delete patron category
* Check patron category summary table.
=> Verified all actions work as expected.
=> Verified chosen value for BlockExpiredPatronOpacActions'
is always displayed and saved correctly.
* Note: The new value is missing from the summary table.
* Note: The new value is also not shown when deleting a patron category.
- Check functionality
* Renew and place a hold for an NOT EXPIRED patron with
a) category: use syspref (default)
syspref: block (default)
b) category: use syspref (default)
syspref: don't block
c) category: block
syspref: don't block
d) category: block
syspref: block
e) category: don't block
sypref: block
* Verified renewals and placing holds were never blocked.
* Also verified that the warning from NotifyBorrowerDeparture
still shows up correctly.
* Renew and place a hold for an EXPIRED patron with
a) category: use syspref (default)
syspref: block (default)
=> OK, both actions are blocked.
b) category: use syspref (default)
syspref: don't block
=> OK, both actions possible.
c) category: block
syspref: don't block
=> OK, both actions are blocked.
d) category: block
syspref: block
=> OK, both actions are blocked.
e) category: don't block
sypref: block
=> OK, both actions possible.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
2014-04-06 Update: Will repeat and amend above test plan on last patch in this series.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit b1451ab1273bc8039d8b85c83422dc1c29db385d
Author: Fridolyn SOMERS <fridolyn.somers at biblibre.com>
Date: Thu Jul 11 11:27:51 2013 +0200
Bug 6739: (follow-up) fix more issues
Installer fixes :
- in kohastructure.sql, category.BlockExpiredPatronOpacActions default
value is -1, sets the same in updatedatabase.pl
- in syspref comment, replaces "opac actions such as placing a hold or
reserve" by "opac actions such as placing holds or renrw books"
- A 'YesNo' does not have 'yes' as value in database, it is '1'.
- corrects small typo "categori" and syspref name case
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 6ae5a267bc011a0fbecb91f98192582ed868ffd2
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Wed Jan 15 11:08:48 2014 +0100
Bug 6739: (follow-up) fix more issues
* Hide renewal column, buttons and links
* Fixes minor bug where upper-right table links would show even if
renewal impossible
* Cleans up some of the template formatting ( whitespace changes only )
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 42c829837cef09fa5449ec415ec2926784830ddb
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Tue Mar 12 13:46:41 2013 -0400
Bug 6739: (follow-up) fix various issues
- translation issues
- wording issues
Signed-off-by: Melia Meggs <melia at bywatersolutions.com>
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 80b7a8153dca1bc8f97976e3686c6527766deef3
Author: Chris Hall <chrish at catalyst.net.nz>
Date: Mon Feb 20 10:07:13 2012 +1300
Bug 6739: make it possible to block expired patrons from OPAC actions
Test Plan:
1) Apply patch
2) Run updatedatabase.pl
3) Pick a patron, note the patron's category
5) Issue an item to this patron
4) Edit that category, set "Block expired patrons" to "Block"
5) Verify the patron cannot renew or place holds in the OPAC
6) Edit the category again, set "Block expired patrons" to
"Don't block"
7) Verify the patron *can* renew and place holds in the OPAC
8) Edit the category again, set "Block expired patrons" to
"Follow system preference BlockExpiredPatronOpacActions"
9) Set the system preference BlockExpiredPatronOpacActions to
"Block"
10) Verify the patron cannot renew or place holds in the OPAC
11) Set the system preference BlockExpiredPatronOpacActions to
"Don't block"
12) Verify the patron *can* renew and place holds in the OPAC
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Melia Meggs <melia at bywatersolutions.com>
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Testing notes on last patch in series.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Members.pm | 34 +++++++-
Koha/Schema/Result/Category.pm | 12 ++-
admin/categorie.pl | 81 +++++++++++++++++---
installer/data/mysql/kohastructure.sql | 1 +
installer/data/mysql/sysprefs.sql | 3 +-
installer/data/mysql/updatedatabase.pl | 20 ++++-
.../prog/en/modules/admin/categorie.tt | 24 ++++++
.../prog/en/modules/admin/preferences/opac.pref | 6 ++
.../prog/en/modules/admin/preferences/patrons.pref | 2 +-
.../opac-tmpl/bootstrap/en/modules/opac-reserve.tt | 4 +
.../opac-tmpl/bootstrap/en/modules/opac-user.tt | 35 +++++++--
.../opac-tmpl/prog/en/modules/opac-reserve.tt | 3 +
koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt | 52 +++++++++----
kohaversion.pl | 2 +-
opac/opac-renew.pl | 66 +++++++++-------
opac/opac-reserve.pl | 12 +++
opac/opac-user.pl | 18 +++--
t/db_dependent/Members.t | 9 ++-
18 files changed, 311 insertions(+), 73 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list