[koha-commits] main Koha release repository branch master updated. v3.18.00-beta-20-g719c133
Git repo owner
gitmaster at git.koha-community.org
Wed Nov 19 17:28:00 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 719c1335d878cc2ab94af262bea4540daabc5d55 (commit)
via 857c68e2a667eea55255a373583c9ed69ea1cea9 (commit)
via bb186e09a6f895cd732dc4969da455d5d92c6f95 (commit)
via 41057dd25ed79d8a988619961acdcb98b9f5e319 (commit)
via c4a8e5fb3e8a40f44664a8103551c37534104053 (commit)
via c134e2111c59e386510ca4c72fec8a019bc5a48e (commit)
via f7463f23207a25542ec05a44617844a4d1e1d067 (commit)
via a317f7d62f2d4f35cd83f26e9c02d8ba989e8e3a (commit)
from b60192397c30cc25d8f9ff4eec5f021111ef9c2d (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 719c1335d878cc2ab94af262bea4540daabc5d55
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Tue Nov 18 08:23:30 2014 +1300
Bug 7143 : Updating history and about page
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Checked the names with git log and Bugzilla.
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 857c68e2a667eea55255a373583c9ed69ea1cea9
Author: Galen Charlton <gmc at esilibrary.com>
Date: Mon May 26 03:09:18 2014 +0000
Bug 12132: display guarantees if a patron has them, regardless of category type
If a patron has guarantees, always display them on the patron summary,
even if the patron is of a type that ordinarily would have them.
For example, at present you can cannot directly add a guarantee to
a staff record the way you can do for an adult patron, but if you create
a juvenile patron and add a guarantor to it, you can override that
restriction. Note that this patch ignores whether that is strictly
desirable behavior.
To test:
[1] Create a juvenile patron. While editing it, make a staff
account a guarantor of the new patron.
[2] View patron details for the staff account. Note that the
juvenile patron is not displayed as a guarantee.
[3] Apply this patch.
[4] Refresh details for the staff account. The juvenile should
now show up.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
Signed-off-by: Frederic Demians <f.demians at tamil.fr>
Galen patch works as described. The way it's implemented seems sensible.
Whatever the reason why a patron has guarantes, it make sense to display
them. So it's better to check the count of guarantes rather than the
current patron type to decide to display guarantes.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Works as described, small change, no regressions found.
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit bb186e09a6f895cd732dc4969da455d5d92c6f95
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Thu Nov 13 23:06:00 2014 +0100
Bug 13223: [QA Follow-up] Adding some unit tests for wrapper
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Trivially amended. Thanks, Katrin.
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 41057dd25ed79d8a988619961acdcb98b9f5e319
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Wed Nov 12 17:02:00 2014 +0100
Bug 13223: [QA Follow-up] Trivial change to one POD line
The line referred to Plugin while it should be FrameworkPlugin.
(I renamed the module in the process but forgot this line.)
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit c4a8e5fb3e8a40f44664a8103551c37534104053
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Nov 7 15:45:08 2014 +0100
Bug 13223: Plugin housekeeping: do not redefine wrapper
This report is connected to bug 10480 which will change the general
mechanism of loading plugins, but can be tested independently and ahead
of that proposed change.
Several unimarc plugins use a wrapper sub. The code of this subroutine
is not exactly the same for all plugins: in some cases the routine is
extended for double character strings (dblspace and dblpipe). It would
not hurt to use the extended code for all plugins.
By moving the code to a module, we prevent redefinition
when two or more plugins are loading wrapper in a do-statement.
NOTE: You will not see wrapper redefine errors in your log, since the
plugins do not use the warnings pragma (yet). Since this patch touches
seventeen unimarc plugins, a unimarc signoff is preferred :)
Test plan:
Use some plugins changed in this patch (if not in use already).
Load the MARC editor.
Click on some tag editor-buttons to check unchanged behavior.
Signed-off-by: Frederic Demians <f.demians at tamil.fr>
Unimarc plugins work as usual. No regression. Simple code
factorization.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit c134e2111c59e386510ca4c72fec8a019bc5a48e
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue Oct 7 14:54:04 2014 -0400
Bug 13039 - Vendor search: sorting of "item count" and "biblio count" columns can be incorrect
On the vendor search results page if some cells contain textual data the
"item count" and "biblio count" columns will sort incorrectly. This
patch sets an explicit numeric sort on these columns. In doing so this
patch also changes the existing column sorting configuration to use
table header cell classes instead of sorting based on index.
This patch also corrects two instances of unescaped ampersands.
To test, search for a vendor which has multiple baskets, at least one of
which should contain canceled orders. Confirm that sorting by item
count, biblio count, date, and closed all work correctly.
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
I have not been able to see the sorting problem, but the
patch causes no regression and everything seems to work nicely.
Passes QA script and tests.
http://bugs.koha-community.org/show_bug.cgi?id=12039
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit f7463f23207a25542ec05a44617844a4d1e1d067
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Fri Oct 17 18:30:34 2014 +0200
Bug 13107 - Members are restricted even if the debarment is ended - opac-user
This is the same issue as bug 12134.
Test Plan:
1) Add a manual restriction to a patron with expiration date in the past.
2) Go on the OPAC and connect (opac-user.pl)
3) Note the warning message
"Your account has been frozen until until XX/XX/XXXX ..."
4) Apply this patch
5) Repeat step 2
6) Note the warning message does not appear anymore
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Works as described.
NOTE: If you set a debarment with date in the past in the GUI,
there will be no entry in borrowers.debarred and you won't be
able to see the problem. Set one with a date in the future and
then alter the date in borrower_debarments and borrowers.debarred.
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit a317f7d62f2d4f35cd83f26e9c02d8ba989e8e3a
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Fri Oct 17 18:37:56 2014 +0200
Bug 13108 - Members are restricted even if the debarment is ended - opac-reserve
This is the same issue as bug 12134.
Test Plan:
1) Add a manual restriction to a patron with expiration date in the past
2) Go on the OPAC and connect
3) Try to add an hold on a record (opac-reserve.pl)
3) Note the warning message
"Sorry, you cannot place holds because your account has been frozen ..."
4) Apply this patch
5) Repeat step 2
6) Note the warning message does not appear anymore
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Makes code cleaner, also works as described.
NOTE: If you set a debarment with date in the past in the GUI,
there will be no entry in borrowers.debarred and you won't be
able to see the problem. Set one with a date in the future and
then alter the date in borrower_debarments and borrowers.debarred.
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
-----------------------------------------------------------------------
Summary of changes:
Koha/Util/FrameworkPlugin.pm | 55 ++++++++++++++++++++
cataloguing/value_builder/unimarc_field_100.pl | 9 +---
.../value_builder/unimarc_field_100_authorities.pl | 9 +---
cataloguing/value_builder/unimarc_field_105.pl | 8 +--
cataloguing/value_builder/unimarc_field_110.pl | 8 +--
cataloguing/value_builder/unimarc_field_115a.pl | 8 +--
cataloguing/value_builder/unimarc_field_115b.pl | 8 +--
cataloguing/value_builder/unimarc_field_116.pl | 10 +---
cataloguing/value_builder/unimarc_field_117.pl | 10 +---
cataloguing/value_builder/unimarc_field_120.pl | 9 +---
cataloguing/value_builder/unimarc_field_121a.pl | 8 +--
cataloguing/value_builder/unimarc_field_125b.pl | 8 +--
cataloguing/value_builder/unimarc_field_126a.pl | 8 +--
cataloguing/value_builder/unimarc_field_128b.pl | 7 +--
cataloguing/value_builder/unimarc_field_130.pl | 8 +--
cataloguing/value_builder/unimarc_field_135a.pl | 8 +--
cataloguing/value_builder/unimarc_field_140.pl | 9 +---
cataloguing/value_builder/unimarc_leader.pl | 8 +--
docs/history.txt | 7 ++-
koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 3 ++
.../prog/en/modules/acqui/booksellers.tt | 35 +++++++------
members/moremember.pl | 4 +-
opac/opac-reserve.pl | 3 +-
opac/opac-user.pl | 3 +-
t/Koha_Util_FrameworkPlugin.t | 13 +++++
25 files changed, 134 insertions(+), 132 deletions(-)
create mode 100644 Koha/Util/FrameworkPlugin.pm
create mode 100755 t/Koha_Util_FrameworkPlugin.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list