[koha-commits] main Koha release repository branch master updated. v3.14.00-503-g63d7386
Git repo owner
gitmaster at git.koha-community.org
Thu Feb 27 16:45:02 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 63d7386ed00f73be837a57aeb12d75c6893ca0bd (commit)
via cd089028b8c5e8f2b15ed2d41ce79bb37873662d (commit)
via a4a014e365a6d27d1105096861a19f94aa5372f7 (commit)
via 3fc7ea191c45ea430f362e4a883a34ebfbd0c330 (commit)
via 18d5f288040fdf2d2b65b569685d60a11d3b86fc (commit)
via a31bf519a9aff560f3157ad7821be3a0afe3d98f (commit)
from 234560a690c78ef7723f15c0cb31f0497d073988 (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 63d7386ed00f73be837a57aeb12d75c6893ca0bd
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon Feb 24 10:21:20 2014 -0500
Bug 11829: fix JavaScript error on staff client biblio details pages if template variables are undefined
The JavaScript included in cat-toolbar.inc expects several variables to
be passed to the template for use in calculations. Several scripts
do not pass the required variables to the template, leading to a JS
error.
This patch re-adds (See Bug 9823) hold count calculation to the required
scripts and copies the acquisitions-related count calculation from
detail.pl into related bibliographic detail scripts so that the
commonly-included cat-toolbar.inc can receive correct values.
To test, locate a bibliographic record which has no holds and is not
used in a current or deleted order, but which has a local cover image
attached. Check the following views to confirm there is no JavaScript
error:
- Normal
- MARC
- Labeled MARC
- ISBD
- Items
- Images (from the Images tab on the "Normal" detail page)
Next, locate a bibliographic record with no items attached which is used
in an Acquisitions order. On each of the pages listed above, choose
"Delete record" from the Edit menu. This should trigger a warning that
the record is used in an order. Cancel the deletion.
Finally, delete the order which references the bibliographic record. On
each of the pages listed above, choose "Delete record" again. This
should trigger a warning that the record is used in a deleted order.
Cancel the deletion.
I went through the test plan, everything works OK.
It resolves Bug 11831 as well.
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
- Printing from MARC and ISBD view works again
- No more Javascript errors found
- Deleting a record with attached order gives the correct warning,
both for ordered and cancelled.
Passes all tests and QA script.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit cd089028b8c5e8f2b15ed2d41ce79bb37873662d
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Feb 20 15:42:37 2014 -0500
Bug 11805 - Use validation plugin when creating new basket in Acquisitions
The page for adding a new basket in Acquisitions includes some custom
form validation JavaScript which can be removed in favor of HTML5
validation attributes and Koha's built-in validation plugin. This patch
does so.
To test, apply the patch and go to Acquisitions -> Choose a vendor ->
New basket. Try submitting the form without entering a basket name. This
should trigger a validation warning.
Submission of the form with valid data should work correctly. Editing an
existing basket should also work correctly.
Patch works as expected.
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Works as expected, passes all tests and QA script.
Tried adding a new basket with/without basket name and editing
an existing basket editing/emptying the basket name.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit a4a014e365a6d27d1105096861a19f94aa5372f7
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon Feb 10 14:13:11 2014 -0500
Bug 11736 - Use new DataTables include in Koha news templates
Bug 10649 introduced a new include file for adding DataTables-related
JavaScript assets. This patch adds use of this include file to the Koha
news page.
To test you should have existing news items with varying creation and
expiration dates. Apply the patch and confirm that table sorting works
correctly for all settings of the dateformat system preference.
C4::NewsChannels.pm has been modified so that it now passes an
unformatted date to the template, where the KohaDates plugin is used to
apply the correct formatting. Sorting is based on the unformatted date.
Also corrected: Capitalization errors.
Signed-off-by: wajasu <matted-34813 at mypacks.net>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Works as described, no problems found.
Also passes tests and QA script.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 3fc7ea191c45ea430f362e4a883a34ebfbd0c330
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Feb 7 14:54:27 2014 -0500
Bug 11716 - Use new DataTables include in label manage template
This patch modifies the template for the label manage pages to use
the new DataTables include. This simplifies the inclusion of assets and
updates to the latest DataTables version.
To test, view the following pages and confirm that table sorting is
working correctly:
Manage layouts (/cgi-bin/koha/labels/label-manage.pl?label_element=layout)
Manage templates (/cgi-bin/koha/labels/label-manage.pl?label_element=template)
Manage profiles (/cgi-bin/koha/labels/label-manage.pl?label_element=profile)
Manage batches (/cgi-bin/koha/labels/label-manage.pl?label_element=batch)
Signed-off-by: wajasu <matted-34813 at mypacks.net>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 18d5f288040fdf2d2b65b569685d60a11d3b86fc
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Feb 7 11:35:17 2014 -0500
Bug 11710 - Use new DataTables include in cataloging Z39.50 search template
This patch modifies the template for the cataloging Z39.50 search
template to use the new DataTables include. This simplifies the
inclusion of assets and updates to the latest DataTables version.
To test, go to cataloging and choose "New from Z39.50." Perform a search
and confirm that table sorting still works correctly.
Signed-off-by: wajasu <matted-34813 at mypacks.net>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit a31bf519a9aff560f3157ad7821be3a0afe3d98f
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Feb 7 15:24:06 2014 -0500
Bug 11717 - Use new DataTables include in member templates
Bug 10649 introduced a new include file for adding DataTables-related
JavaScript assets. This patch adds use of this include file to all
member pages which use DataTables.
Apply the patch and test the following pages to confirm that table
sorting works correctly:
- Patron details (members/moremember.pl)
- The checkouts, relatives' checkouts, and holds tables have been
modified to exclude articles when sorting of titles.
- Notices (members/notices.pl)
- Circulation history (members/readingrec.pl)
- Statistics (members/statistics.pl)
- Update child to adult patron (members/update-child.pl) - This is the
page which appears in a pop-up when you update a child patron to an
adult (from the "More" menu in the toolbar when viewing patron
details).
Signed-off-by: Aleisha <aleishaamohia at hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
-----------------------------------------------------------------------
Summary of changes:
C4/NewsChannels.pm | 2 --
catalogue/ISBDdetail.pl | 32 ++++++++++++++++++++
catalogue/MARCdetail.pl | 31 +++++++++++++++++++
catalogue/imageviewer.pl | 32 ++++++++++++++++++++
catalogue/labeledMARCdetail.pl | 32 ++++++++++++++++++++
catalogue/moredetail.pl | 31 +++++++++++++++++++
.../prog/en/modules/acqui/basketheader.tt | 27 +++--------------
.../prog/en/modules/cataloguing/z3950_search.tt | 4 +--
.../prog/en/modules/labels/label-manage.tt | 7 +++--
.../prog/en/modules/members/moremember.tt | 12 +++-----
.../prog/en/modules/members/notices.tt | 4 +--
.../prog/en/modules/members/readingrec.tt | 6 ++--
.../prog/en/modules/members/statistics.tt | 6 ++--
.../prog/en/modules/members/update-child.tt | 6 ++--
.../prog/en/modules/tools/koha-news.tt | 17 ++++++-----
15 files changed, 188 insertions(+), 61 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list