[koha-commits] main Koha release repository branch master updated. v3.14.00-448-ga97f21a
Git repo owner
gitmaster at git.koha-community.org
Wed Feb 19 17:54:06 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 a97f21ad3ba53ecd30089c7f802ab9b3ad430806 (commit)
via ed6e2b57a1d47f413aa4f5f691e82b849daa8468 (commit)
via 37a0e888199f1a1f8eefd38ad6ada786403fe034 (commit)
via 065a3a5efa9b90723460a607ac85591c17945b00 (commit)
via 858083c8e907bde4efa6842cd45ff91bf1f6e24f (commit)
via 9d5fadb9831f03ab80489f9f18467a1796fc9447 (commit)
via 7d05394ff2b27f7e08e41b908b445a33414edc0e (commit)
via 5ee8268a8df6ac193aa0500f4b801a3d359c1838 (commit)
via ac9d872fefc867d4f068d425bcfcb929435809bd (commit)
via 6fd26558894869c0e80666007cab3b9edb090008 (commit)
from d90b4b6a08aa946fd40d1c1a45d1cc4ad64c30e5 (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 a97f21ad3ba53ecd30089c7f802ab9b3ad430806
Author: Galen Charlton <gmc at esilibrary.com>
Date: Wed Feb 19 17:09:34 2014 +0000
Bug 11777: add regression test
This patch adds a regression test for ensuring that the
authorisedby field is returned by SearchOrders().
To test:
[1] Upon applying the main patch, verify that
prove -v t/db_dependent/Acquisition.t passes.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit ed6e2b57a1d47f413aa4f5f691e82b849daa8468
Author: Amit Gupta <amitddng135 at gmail.com>
Date: Tue Feb 18 14:57:44 2014 +0530
Bug 11777: ensure "created by" is displayed by the order receiving page
This fixes a regression introduced by the patches for bug 10723.
To Test:
1) Create budget and fund under budget administration.
2) Create Vendor in acquisitons module.
3) Create basket under vendor.
4) Create order and choose budget while creating order.
5) Click on Receive shipment button.
6) Click on receive link on the right hand side you
will be able to see a staff user name in the "created by"
field.
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 37a0e888199f1a1f8eefd38ad6ada786403fe034
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Tue Feb 18 09:47:32 2014 -0500
Bug 11783: ensure CD field in SIP patron information response is populated
If a patron has a record-level hold that is unavailable, any patron
information request will send back an empty CD field when this field
should have an item barcode in it [RM note: this actually isn't
universally true -- the SIP2 standard is silent as to what is supposed
to go in the CD field. Some SIP2 devices do indeed want an item
barcode, but others are known to just want a display of the title
and author of the request in question. Providing an option is the
topic of a new enhancement request, however.]
This is due to a minor error in ILS::Patron::_get_outstanding_holds
where GetItemnumbersForBiblio is assumed to return an array but in
reality returns an arrayref.
Test Plan:
1) Create a record level hold for a patron and record
2) Using SIP2, make a patron information request
3) Note the empty CD fields
4) Apply this patch, restart SIP server
5) Repeat step 2
6) Note the CD field now has a barcode
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
I did not test this patch but the following code shows me it is correct:
use C4::Items;
use Data::Dumper;
my $biblionumber = 5035;
my $itemnumber = (GetItemnumbersForBiblio($biblionumber))[0];
say Dumper $itemnumber;
$itemnumber = (GetItemnumbersForBiblio($biblionumber))->[0];
say Dumper $itemnumber;
displays:
$VAR1 = [
'23168',
'23169',
'23170',
'23171',
'23172'
];
$VAR1 = '23168';
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 065a3a5efa9b90723460a607ac85591c17945b00
Author: Galen Charlton <gmc at esilibrary.com>
Date: Wed Feb 19 16:40:06 2014 +0000
Bug 11779: (follow-up) improve GetLoggedInBranchcode() and add test cases
This patch adjusts the new GetLoggedInBranchcode() template function so
that it returns the empty string rather than undef if there is no
active user environment. That way, there won't be lots of undefined
value warnings if/when this function gets used in the OPAC.
This patch also adds test cases.
To test:
[1] Verify that there are no regressions in the main test
plan for this bug.
[2] Verify that prove -v t/db_dependent/Koha_template_plugin_Branches.t
passes.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 858083c8e907bde4efa6842cd45ff91bf1f6e24f
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Tue Feb 18 07:43:44 2014 -0500
Bug 11779: fix unexpected change in logged-in library when changing overdue notice triggers
Steps to reproduce:
1) Log into staff intranet
2) Set logged in branch
3) Browse to tools/overdue notice triggers
4) Select a branch from the pulldown that is not your logged in branch
5) use the "Check out" bar at the top of the page to search for a patron
to check out to
6) Once you have landed here, click the "check out" tab link again, or
the Edit button ( any action really )
7) Note your logged in branch has now changed to the once selected
when editing the notice/status triggers
This is due to the way the patron search passes the branchcode to be
used via the form. This form assumes the branchcode variable is
always the currently logged in branch, which may not and is not
always the case.
Test Plan:
1) Apply this patch
2) Repeat the steps to reproduce above
3) Note your logged in branch does not change
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Funny bug :) This patch fixes the described issue and should not
introduce regression.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 9d5fadb9831f03ab80489f9f18467a1796fc9447
Author: Marc Véron <veron at veron.ch>
Date: Tue Feb 18 01:18:23 2014 +0100
Bug 11784 - fix displaying patron images in self checkout
I suppose this bug was introduced with Bug 10636 (patronimage should
have borrowernumber as PK, not cardnumber)
To test:
- Have a Patron with image. Configure everything to show image in SCO.
- Go to SCO and log in patron
- Image does not show up (broken link)
- Apply patch
- Test with prog, ccsr and bootstrap themes
- Image should display
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 7d05394ff2b27f7e08e41b908b445a33414edc0e
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon Feb 10 15:29:06 2014 -0500
Bug 11740 - Use new DataTables include in quotes upload template
Bug 10649 introduced a new include file for adding DataTables-related
JavaScript assets. This patch adds use of this include file to the
quotes upload page.
To test you need a CSV file of quotes to upload ( "source","text" ).
Go to Tools -> Quote editor and click the "Import quotes" button. Upload
the CSV file and confirm that the table which previews the import
results loads correctly. Sorting is not enabled, but pagination and
searching should work.
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
No regression found.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 5ee8268a8df6ac193aa0500f4b801a3d359c1838
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Feb 14 14:29:47 2014 -0500
Bug 11767 - Use validation plugin when creating new authority framework tag
The page for adding a new tag to an authority framework 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.
The patch also moves some tag markup out of the script and into the
template where it belongs.
To test, apply the patch and go to Administration -> Authority types ->
MARC structure -> New tag. Try submitting the form without entering a
tag number. This should trigger a validation warning.
Submission of the form with valid data should work correctly. Editing an
existing tag should also work correctly.
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit ac9d872fefc867d4f068d425bcfcb929435809bd
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Feb 14 13:11:04 2014 -0500
Bug 11766 - Use validation plugin when creating new authority type
The new authority type entry form uses custom form validation
JavaScript. This patch removes it in favor of using HTML5 validation
attributes and Koha's built-in validation plugin.
To test, go to Administration -> Authority types and click "New
authority type." Try submitting the form without entering any data. You
should see a warning about required fields. Upon entering text in those
fields the warning should disappear.
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 6fd26558894869c0e80666007cab3b9edb090008
Author: Owen Leonard <oleonard at myacpl.org>
Date: Wed Feb 12 10:12:58 2014 -0500
Bug 11749 - Remove unused jQuery plugin jquery.hoverIntent.minified.js from the staff client
The jQuery plugin jquery.hoverIntent.minified.js is used only in the
OPAC, not the staff client. This patch removes it from the staff client.
To test, apply the patch and search for instances of "hoverIntent." Only
references in OPAC templates should be returned.
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Acquisition.pm | 1 +
C4/SIP/ILS/Patron.pm | 2 +-
Koha/Template/Plugin/Branches.pm | 9 +++
admin/auth_tag_structure.pl | 6 +-
.../prog/en/includes/patron-search-box.inc | 6 +-
.../jquery/plugins/jquery.hoverIntent.minified.js | 9 ---
.../prog/en/modules/admin/auth_tag_structure.tt | 61 ++++++--------------
.../prog/en/modules/admin/authtypes.tt | 43 +++-----------
.../prog/en/modules/tools/quotes-upload.tt | 7 +--
.../opac-tmpl/bootstrap/en/modules/sco/sco-main.tt | 2 +-
.../opac-tmpl/prog/en/modules/sco/sco-main.tt | 2 +-
t/db_dependent/Acquisition.t | 3 +-
t/db_dependent/Koha_template_plugin_Branches.t | 13 ++++-
13 files changed, 58 insertions(+), 106 deletions(-)
delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/lib/jquery/plugins/jquery.hoverIntent.minified.js
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list