[koha-commits] main Koha release repository branch master updated. v3.18.00-95-ge012270
Git repo owner
gitmaster at git.koha-community.org
Sun Jan 4 16:14:16 CET 2015
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 e0122701aa9589b77f44e9a6cb20043aa19a8cbf (commit)
via 058470acee72d6c77389f59c80d3488194843cee (commit)
via d8eff67534ca5c4a16f730f6449fd4db1b507927 (commit)
via 45de696ce41ce8067043c26ef457530f39fc2bc2 (commit)
via d23abaf0b836c8dfdfc1ad2dbeecd661c2cf6133 (commit)
via f05345f70d3462c0d3a30b44d436c1051e194073 (commit)
via 936a4f22288ff013a2e4269a934df7fa900c7336 (commit)
via 352d9cd2fd0ea7ddc075094e3f9d310abc894ac4 (commit)
via 3e5ea114523b29bd36688f33d6cb3012756cfd8b (commit)
via e8f5312dc7789b255d4d283750a821c51c05ebea (commit)
from a93fd3fe06dbdea972ea8c329ae4f77335314566 (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 e0122701aa9589b77f44e9a6cb20043aa19a8cbf
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue Oct 21 12:52:54 2014 -0400
Bug 13119 - Use XSLT to display tagged titles in the OPAC
This patch updates the display of a logged-in user's tagged titles to
use the same XSLT stylesheet used by search results and Lists. This
would make for a more consistent display of information.
Unrelated change: Corrected "My tags" header to read "Your tags,"
consistent with sidebar navigation.
To test you should have multiple titles in your catalog which you have
tagged in the OPAC.
- Set the OPACXSLTResultsDisplay system preference to 'default'
- Log in to the OPAC and view the "your tags" page.
- Confirm that title information is displayed correctly. Compare to
search results.
- Empty the OPACXSLTResultsDisplay system preference and reload the
"your tags" page. The display should revert to the old view, showing
title, subtitle (if any) and author (if any).
- Set the OPACXSLTResultsDisplay to a custom path pointing to a custom
XSL file and confirm that the list of your tagged titles changes
accordingly.
Note: A follow-up will add "action" links ("place hold," "add to cart,"
etc) consistent with other pages.
Signed-off-by: Frederic Demians <f.demians at tamil.fr>
Works as described. opac-tag.pl page displays tagged titles the same way as
result & list pages.
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 058470acee72d6c77389f59c80d3488194843cee
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Sun Dec 28 21:20:55 2014 -0300
Bug 13496: make auth.tt use a template plugin to get the Koha version
This patch makes the installer login template use the new Koha.Version
template plugin to get the correct Koha version. This way we don't need
to maintain the auth.tt file on each version change, and are sure screen
readers tell the correct version.
To test:
- Create a situation where the login screen from the installer shows
- Navigate the HTML code (Ctrl+u)
=> FAIL: "Koha 3.0 Installer" shows on the HTML code
- Apply the patch
- Reload the page
=> SUCCESS: The correct version number is shown.
- Sign off :-D
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit d8eff67534ca5c4a16f730f6449fd4db1b507927
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Sun Dec 28 19:44:39 2014 -0300
Bug 13496: add a method for the templates to print Koha version as desired
This patch introduces a simple template plugin function that returns
the Koha version number in different suitable formats.
It introduces unit tests for the new function. They are run with
To test:
- Apply the patch
- Run
$ prove t/Koha_Template_Plugin_Koha.t
=> SUCCESS: the tests pass.
- Sign off :-D
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 45de696ce41ce8067043c26ef457530f39fc2bc2
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Thu Jan 1 20:34:00 2015 -0500
Bug 13495 [QA Followup] - Re-word "Renew or return" button as well
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit d23abaf0b836c8dfdfc1ad2dbeecd661c2cf6133
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Sat Dec 27 18:48:28 2014 +0100
Bug 13495: Use "checked in" instead of "returned" in circulation
To test:
- check out one or many items on a patron account
- return the items from the checkout table
- notice that a message "Checked in" is now shown
in the first and last column, instead of "Returned"
as before
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
I feel dirty signing this off, but I guess we have to be consistent in
our language
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Fixed merge conflict by removing changed lines no longer needed.
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit f05345f70d3462c0d3a30b44d436c1051e194073
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Sat Nov 29 13:31:26 2014 +0100
Bug 9124: Remove non-existing field mapping and auth value for 942$e
942$e is mapped to biblioitems.cn_edition, which doesn't exist and
to an authorized value CN_EDITION, which doesn't exist either.
Patch removes the wrong mapping and non-existing auth value from
the frameworks.
To test:
- git diff --color-words HEAD^ is helpful
- Check all mappings are changed and SQL is still valid
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 936a4f22288ff013a2e4269a934df7fa900c7336
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Wed Dec 31 13:23:06 2014 +0100
Bug 13504: Remove the '----' marker for CHECKIN and CHECKOUT notices
If only 1 item exist in the message, the marker is not removed.
This marker is removed by render_metadata, but this method is only
called on appending.
Test plan:
1/ Enable the CHECKIN and/or CHECKOUT notices for a patron
2/ check and item in or out and verify that the marker is no longer
displayed in the generated notices.
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 352d9cd2fd0ea7ddc075094e3f9d310abc894ac4
Author: Frédéric Demians <f.demians at tamil.fr>
Date: Sun Nov 2 17:41:34 2014 +0100
Bug 13167 Stage MARC for Import hangs for biblio containing invalid ISBN-13
If the ISBN of a UNIMARC record begins with 979 then the 'Stage MARC for
import' hangs. If I use the same UNIMARC record and change 979 to 978 in the
ISBN, 'Stage MARC for import' works perfectly.
The patch deals with the fact that converting an ISBN-13 to ISBN-10 with
Business::ISBN as_isbn10() method fails if the ISBN doesn't begin with 978.
TEST PLAN:
(1) Download, and decompress the ZIP file attached to BZ.
(2) On a UNIMARC Koha instance, go in Tools > Stage MARC for import.
(3) Choose the MARC file containing the record with an ISBN begining with 979.
Click on Upload file, then Stage to import.
(4) The Job progress bar stay at 0%.
(5) Apply the patch. Repeat steps 2-3. The upload works.
Signed-off-by: Colin Campbell <colin.campbell at ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Tested in a UNIMARC installation, confirmed that the patch fixes the
problem.
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 3e5ea114523b29bd36688f33d6cb3012756cfd8b
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Sun Jan 4 11:14:58 2015 -0300
Bug 13167: (QA followup) regression tests
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit e8f5312dc7789b255d4d283750a821c51c05ebea
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Sun Jan 4 10:53:35 2015 -0300
Bug 12896: (QA followup) use C4::Bookseller in t/db_dependent/Serials/Claims.t
As C4::Bookseller is no longer imported in C4::Acquisition the tests
fail because of an undefined function call.
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Koha.pm | 1 +
C4/Message.pm | 7 +-
Koha/Template/Plugin/Koha.pm | 14 ++++
.../marc21/mandatory/marc21_framework_DEFAULT.sql | 2 +-
.../optional/marc21_simple_bib_frameworks.sql | 16 ++--
.../marc21/mandatory/marc21_framework_DEFAULT.sql | 2 +-
.../optional/marc21_simple_bib_frameworks.sql | 16 ++--
.../marc21/mandatory/marc21_framework_DEFAULT.sql | 2 +-
.../optional/marc21_simple_bib_frameworks.sql | 16 ++--
.../Obligatoire/marc21_framework_DEFAULT.sql | 2 +-
.../Optionnel/marc21_simple_bib_frameworks.sql | 16 ++--
.../marc21/mandatory/marc21_framework_DEFAULT.sql | 2 +-
.../optional/marc21_simple_bib_frameworks.sql | 16 ++--
.../marc21/mandatory/marc21_framework_DEFAULT.sql | 2 +-
.../optional/marc21_simple_bib_frameworks.sql | 16 ++--
.../marc21/mandatory/marc21_framework_DEFAULT.sql | 2 +-
.../optional/marc21_simple_bib_frameworks.sql | 16 ++--
.../mandatory/unimarc_framework_DEFAULT.sql | 4 +-
.../marc21_bibliographic_DEFAULT_local.sql | 2 +-
.../optional/marc21_bibliographic_AR_local.sql | 2 +-
.../optional/marc21_bibliographic_BKS_local.sql | 2 +-
.../optional/marc21_bibliographic_CF_local.sql | 2 +-
.../optional/marc21_bibliographic_IR_local.sql | 2 +-
.../optional/marc21_bibliographic_KT_local.sql | 2 +-
.../optional/marc21_bibliographic_SER_local.sql | 2 +-
.../optional/marc21_bibliographic_SR_local.sql | 2 +-
.../optional/marc21_bibliographic_VR_local.sql | 2 +-
.../unimarc_bibliographic_DEFAULT_local_995.sql | 3 +-
...rc_bibliographic_DEFAULT_local_952_obsolete.sql | 2 +-
.../marc21_bibliographic_DEFAULT_local.sql | 2 +-
.../optional/marc21_bibliographic_AR_local.sql | 2 +-
.../optional/marc21_bibliographic_BKS_local.sql | 2 +-
.../optional/marc21_bibliographic_CF_local.sql | 2 +-
.../optional/marc21_bibliographic_IR_local.sql | 2 +-
.../optional/marc21_bibliographic_KT_local.sql | 2 +-
.../optional/marc21_bibliographic_SER_local.sql | 2 +-
.../optional/marc21_bibliographic_SR_local.sql | 2 +-
.../optional/marc21_bibliographic_VR_local.sql | 2 +-
.../unimarc_bibliographic_DEFAULT_local_995.sql | 3 +-
.../optional/unimarc_bibliographic_AN_local.sql | 3 +-
.../optional/unimarc_bibliographic_AUD_local.sql | 3 +-
.../optional/unimarc_bibliographic_BOOK_local.sql | 3 +-
...rc_bibliographic_DEFAULT_local_952_obsolete.sql | 2 +-
.../optional/unimarc_bibliographic_EL_local.sql | 3 +-
.../optional/unimarc_bibliographic_MIN_local.sql | 3 +-
.../optional/unimarc_bibliographic_NOTE_local.sql | 3 +-
.../optional/unimarc_bibliographic_PER_local.sql | 3 +-
.../optional/unimarc_bibliographic_TECH_local.sql | 3 +-
.../prog/en/includes/checkouts-table.inc | 2 +-
.../intranet-tmpl/prog/en/includes/strings.inc | 4 +-
.../prog/en/modules/installer/auth.tt | 3 +-
.../opac-tmpl/bootstrap/en/modules/opac-tags.tt | 22 +++++-
opac/opac-tags.pl | 4 +
t/Koha.t | 29 +++++++-
t/Koha_Template_Plugin_Koha.t | 77 ++++++++++++++++++++
t/db_dependent/Serials/Claims.t | 1 +
56 files changed, 247 insertions(+), 117 deletions(-)
create mode 100644 t/Koha_Template_Plugin_Koha.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list