[koha-commits] main Koha release repository branch master updated. v17.11.00-237-g0853b50
Git repo owner
gitmaster at git.koha-community.org
Tue Dec 26 16:59:52 CET 2017
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 0853b50f016107d48b33a8e6a0fa5ff6b1006fa7 (commit)
via e678098109187e8d76d8567396f622886904fffc (commit)
via 6f7bc759852badba028a9eb398e236ad6d27acf2 (commit)
via d777c044be6af4e369bd3d5b72ca4ab607608196 (commit)
via 01e66ec78f07b3c0ed3ffeeeae672634f65f97ea (commit)
via 14e2185f9408f89d14ee5b8fabf7cc2abdd632f8 (commit)
via bfe025688355eb714c24bd608726bc61f3224cbd (commit)
via 759a86efd10f75cb4b038046957e28f2906b8dd5 (commit)
via 1b8d085375bbfeec0e5f57451bd6249013dea6ea (commit)
via c9839e84950f84a73da8bdff9d038b956dc04198 (commit)
via 29f56fd5a0fe35927ca97f43e459d3ec5b2d24f4 (commit)
via 8669dc1548b1425fa54ca49ef1a64ff28932ffbd (commit)
via 2a4e76876bffbeac5d147255c70d698c539d98ee (commit)
via aeb3a88224782944e46f9c56e99a5ff375cf77b5 (commit)
via 9e541af7543d2169e2f926b5b2a8189f5e49c97f (commit)
from 8592be20367790582c7235988ceafc5350a036b3 (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 0853b50f016107d48b33a8e6a0fa5ff6b1006fa7
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Fri Dec 22 11:38:32 2017 +0000
Bug 19603: (QA follow-up) Remove unused message
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit e678098109187e8d76d8567396f622886904fffc
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Nov 9 14:30:26 2017 +0000
Bug 19603: Move admin templates JavaScript to the footer: Patrons and circulation
This patch modifies the staff client patrons and circulation-related
administration templates so that JavaScript is included in the footer
instead of the header.
To test, apply the patch and test the JavaScript-driven features of
each modified template: All button controls, DataTables functionality,
tabs, etc.
Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de>
Edit: Rebased
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 6f7bc759852badba028a9eb398e236ad6d27acf2
Author: Liz Rea <liz at catalyst.net.nz>
Date: Tue Sep 19 15:29:22 2017 +1200
Bug 19338: Fix sorting by dates in opac-account.tt
To test:
Find an account with lots of fines/payments
load up the borrower's account in the OPAC
note that the sort on the dates sorts by day, and not by date.
apply this patch
reload the page, note that the sort on the dates is now correct.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Alex Arnaud <alex.arnaud at biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit d777c044be6af4e369bd3d5b72ca4ab607608196
Author: Owen Leonard <oleonard at myacpl.org>
Date: Wed Dec 20 19:48:13 2017 +0000
Bug 19860: Make staff client home page responsive
This patch rewrites the markup of the staff client home page to use the
Bootstrap grid instead of the YUI grid, taking advantage of Bootstrap's
built-in responsiveness.
This patch does not affect the logo and search form in the header. It
will be necessary to address search forms in another patch.
To test, apply the patch and clear your browser cache if necessary. For
better results, apply the patch for Bug 19851 as well.
- View the staff client home page and test the layout at various browser
widths.
- Test with and without news items
- Test with and without content in IntranetmainUserblock
Signed-off-by: Dominic Pichette <dominic.pichette at inlibro.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 01e66ec78f07b3c0ed3ffeeeae672634f65f97ea
Author: Owen Leonard <oleonard at myacpl.org>
Date: Wed Dec 20 17:09:30 2017 +0000
Bug 19851: Improve responsive layout handling of staff client menu bar
This patch modifies CSS and markup in the staff client header to
override the default responsive style of the menu bar. The changed
layout will keep the menu bar items in a horizontal line at lower screen
widths.
To test, apply the patch and clear your browser cache if necessary.
- Log in to the staff client and confirm that the appearance of the
menu bar at the top of the screen looks correct at various browser
widths.
- Confirm that the logged-in user menu label and help link expand and
collapse according to browser width.
Signed-off-by: Dominic Pichette <dominic.pichette at inlibro.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 14e2185f9408f89d14ee5b8fabf7cc2abdd632f8
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Wed Dec 20 16:19:18 2017 -0300
Bug 19841: Make AddMember raise an exception if categorycode is invalid
This patch makes C4::Members::AddMember raise a Koha::Exceptions::BadParameter
exception. The current behaviour is to just explode. Code calling
AddReturn should work as expected, unless they are looking for a
specific failure message.
It is just explodes in a way we know what happened, in the case the
categorycode is invalid.
To test:
- Apply the Unit tests patch
- Run:
$ kshell
k$ prove t/db_dependent/Members.t
=> FAIL: Tests fail because AddReturn doesn't raise an exception
- Apply this patch
- Run:
$ kshell
k$ prove t/db_dependent/Members.t
=> SUCCESS: Tests pass!
- Sign off :-D
Signed-off-by: Dominic Pichette <dominic.pichette at inlibro.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit bfe025688355eb714c24bd608726bc61f3224cbd
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Wed Dec 20 16:19:07 2017 -0300
Bug 19841: Unit tests
This patch introduces unit tests for the new behaviour of AddMember
(raising an exception if the passed categorycode is not valid.
To test:
- Apply this patch
- Run:
$ kshell
k$ prove t/db_dependent/Members.t
=> FAIL: It should fail because the feature is still not implemented.
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 759a86efd10f75cb4b038046957e28f2906b8dd5
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Fri Dec 22 08:02:10 2017 +0000
Bug 19623: (QA follow-up) Add missing footerjs variable in merge.tt
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 1b8d085375bbfeec0e5f57451bd6249013dea6ea
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Dec 22 13:37:58 2017 +0000
Bug 19623: (follow-up) Correct footer include in pop-up windows
This patch corrects the footer include in two templates for Z39.50
pop-up windows. popup-bottom.inc shouldn't be used because it doesn't
have the JavaScript embed code in it.
To test, perform a Z39.50 search from both the MARC bibliographic editor
and the MARC authority editor. In both cases the Z39.50 popup window
should work correctly.
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit c9839e84950f84a73da8bdff9d038b956dc04198
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue Nov 14 17:53:24 2017 +0000
Bug 19623: Move template JavaScript to the footer: Cataloging
This patch modifies some staff client cataloging templates so that
JavaScript is included in the footer instead of the header.
Several cataloging templates are excluded because they require
significant structural changes: addbiblio.tt, additem.tt, and editor.tt
To test, apply the patch and test the JavaScript-driven features of the
modified templates: All button controls, DataTables functionality, tabs,
etc.
Note that z350_auth_search.tt is tested by performing a Z39.50 search
from the Authorities module.
Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 29f56fd5a0fe35927ca97f43e459d3ec5b2d24f4
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Thu Dec 21 21:16:59 2017 +0000
Bug 19608: (QA follow-up) Fix menu item styling for clone-rules
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 8669dc1548b1425fa54ca49ef1a64ff28932ffbd
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Dec 14 13:11:10 2017 +0000
Bug 19608: (QA follow-up) Fix redirect on localization modal
This patch makes two minor corrections:
1. The item types localization modal redirect problem has been fixed by
excluding the anti-clickjack code from executing in the footer.
2. The sidebar menu highlighting script has been modified to correctly
handle the clone-rules page.
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 2a4e76876bffbeac5d147255c70d698c539d98ee
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue Nov 14 16:13:56 2017 +0000
Bug 19608: Move admin templates JavaScript to the footer: The rest
This patch modifies the staff client administration templates so that
JavaScript is included in the footer instead of the header.
To test, apply the patch and test the JavaScript-driven features of the
modified templates: All button controls, DataTables functionality, tabs,
etc.
To test the changes to localization.tt you must have more than one
translation installed. Go to admin/itemtypes.pl, edit an itemtype, and
click the 'Translate into other languages' link.
To test the changes to sur_modmapping.tt, go to admin/z3950servers.pl
and create a new SRU server. Click the 'Modify' button next to 'SRU
Search fields mapping'
Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit aeb3a88224782944e46f9c56e99a5ff375cf77b5
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Dec 26 12:33:39 2017 -0300
Bug 19826: Add tests
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 9e541af7543d2169e2f926b5b2a8189f5e49c97f
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Mon Dec 18 11:25:00 2017 -0300
Bug 19826: Add K::Acq::Budget(s) and K::Acq::Fund(s)
This patch introduces Koha::Object(s)-derived classes for budgets and funds (aqbudgetperiods and aqbudgets respectively).
C4::Budgets already uses DBIC calls on those tables so transition should be easy on top of this.
To test:
- Check the referenced schema files are the right ones.
- QA scripts shoudl be happy.
- Sign off :-D
Note: the POD coverage report throws a false negative result on singular classes which is trivially wrong.
Signed-off-by: Aleisha Amohia <aleishaamohia at hotmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
-----------------------------------------------------------------------
Summary of changes:
C4/Members.pm | 19 +-
Koha/{CsvProfile.pm => Acquisition/Budget.pm} | 12 +-
Koha/Acquisition/{Orders.pm => Budgets.pm} | 12 +-
Koha/{City.pm => Acquisition/Fund.pm} | 14 +-
Koha/Acquisition/{Orders.pm => Funds.pm} | 12 +-
koha-tmpl/intranet-tmpl/prog/css/mainpage.css | 12 +-
koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 71 ++++
.../prog/en/includes/doc-head-close.inc | 2 +-
.../intranet-tmpl/prog/en/includes/header.inc | 83 +++--
.../prog/en/includes/popup-bottom.inc | 4 +
.../en/modules/admin/branch_transfer_limits.tt | 80 +++--
.../prog/en/modules/admin/categories.tt | 21 +-
.../intranet-tmpl/prog/en/modules/admin/cities.tt | 35 +-
.../prog/en/modules/admin/clone-rules.tt | 6 +
.../prog/en/modules/admin/currency.tt | 81 +++--
.../prog/en/modules/admin/edi_accounts.tt | 5 +
.../prog/en/modules/admin/edi_ean_accounts.tt | 5 +
.../en/modules/admin/item_circulation_alerts.tt | 101 +++---
.../prog/en/modules/admin/itemtypes.tt | 1 +
.../prog/en/modules/admin/localization.tt | 375 ++++++++++----------
.../prog/en/modules/admin/patron-attr-types.tt | 39 +-
.../prog/en/modules/admin/smart-rules.tt | 247 ++++++-------
.../prog/en/modules/admin/sru_modmapping.tt | 56 +--
.../prog/en/modules/admin/transport-cost-matrix.tt | 116 +++---
.../prog/en/modules/cataloguing/addbooks.tt | 158 +++++----
.../prog/en/modules/cataloguing/merge.tt | 229 ++++++------
.../en/modules/cataloguing/z3950_auth_search.tt | 105 +++---
.../prog/en/modules/cataloguing/z3950_search.tt | 81 +++--
.../intranet-tmpl/prog/en/modules/intranet-main.tt | 369 +++++++++----------
koha-tmpl/intranet-tmpl/prog/js/admin-menu.js | 2 +
.../opac-tmpl/bootstrap/en/modules/opac-account.tt | 10 +-
t/db_dependent/Koha/Acquisition/Budgets.t | 54 +++
.../Subfields.t => Koha/Acquisition/Funds.t} | 40 +--
t/db_dependent/Members.t | 26 +-
34 files changed, 1363 insertions(+), 1120 deletions(-)
copy Koha/{CsvProfile.pm => Acquisition/Budget.pm} (85%)
copy Koha/Acquisition/{Orders.pm => Budgets.pm} (83%)
copy Koha/{City.pm => Acquisition/Fund.pm} (86%)
copy Koha/Acquisition/{Orders.pm => Funds.pm} (83%)
create mode 100644 t/db_dependent/Koha/Acquisition/Budgets.t
copy t/db_dependent/{Authority/Subfields.t => Koha/Acquisition/Funds.t} (51%)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list