[koha-commits] main Koha release repository branch master updated. v18.11.00-98-gfb98450
Git repo owner
gitmaster at git.koha-community.org
Wed Jan 2 22:20:18 CET 2019
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 fb98450172cbd446768375cd9374962447df7cfe (commit)
via 0a68a662ee4b7b2aebdb313ee33f9d9ca54e2c22 (commit)
via d44a42e417b563f501f038cc5226eda0f5fb3ca5 (commit)
via 54e295e4c14e3d2b3959e3185a54447a9b90d945 (commit)
via ad0575ab80ab550ac936ece84e08cdcf458c9159 (commit)
via 464bf007d60bb647ce3dda183134363962c76209 (commit)
via a8fa74ab02d037d059e4bf78b74232aeba219212 (commit)
via 912fb42458a422248986c74fd8a1fd92df531fb5 (commit)
via 5d49ea039c981ee73085c70b326ea47c29bee0ba (commit)
via a440f6a4102f73073c76a31ad2d015be2af8ef48 (commit)
via e1ae3036e63db085a0e23d1619c44b0b8e91673a (commit)
via 364c0d6bc56fc1cb5e6721e2ae3e62be98109a60 (commit)
via f3011690fc24dae2c39c2afd4d13afb43ebaecc4 (commit)
via 94bdfc2beee9da1ed3b8159e211272a42d01e4fa (commit)
via d3ff671f215398ad51a6ce550c33c0c6ca3aa30a (commit)
via 85c474e59761e2bb27d9921180752249b5edca9e (commit)
via 8748d801099e1c4e4f8f845a69d1cdba4a21e7aa (commit)
via ca124b5c14a3f0a34fafe307fec9ade4008eaa41 (commit)
from 3f734900f0a86e5478afc22cb77b493500e998e9 (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 fb98450172cbd446768375cd9374962447df7cfe
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Wed Jan 2 20:55:54 2019 +0000
Bug 21802: Compiled CSS
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 0a68a662ee4b7b2aebdb313ee33f9d9ca54e2c22
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Sun Dec 16 12:58:14 2018 -0300
Bug 21802: Align fieldset with accordion headers when editing notice's template
Test plan:
Regenerate the css using `yarn css`
Edit a notice's template and confirm that the fieldsets are aligned with
the accordion headers
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit d44a42e417b563f501f038cc5226eda0f5fb3ca5
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Dec 12 12:22:47 2018 -0300
Bug 21990: Replace dialog .error with .alert
<div class="dialog error"> will display a div without background color, the correct class is "dialog alert".
https://wiki.koha-community.org/wiki/Interface_patterns#Error_messages
Test plan:
Hit /cgi-bin/koha/acqui/parcel.pl
Notice the background color change with and without this patch
Signed-off-by: Pierre-Marc Thibault <pierre-marc.thibault at inLibro.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 54e295e4c14e3d2b3959e3185a54447a9b90d945
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Dec 20 19:55:46 2018 -0300
Bug 22034: Handle default framework for MARC view with framework
To test:
- Create a record in any framework that is not default
- Search for the record in your catalog
- Switch to the MARC tab
- Change framework pull down to default on top
- Note the page reloads and the framework stay default
- Verify it works for other frameworks
Also test the "labeled MARC" view (you will need the pref viewLabeledMARC turned on)
Signed-off-by: Nazlı Çetin <nazli at devinim.com.tr>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit ad0575ab80ab550ac936ece84e08cdcf458c9159
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Thu Dec 6 16:27:31 2018 -0300
Bug 21578: Terminology changes in patron's account section (staff)
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 464bf007d60bb647ce3dda183134363962c76209
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Dec 14 17:34:59 2018 -0300
Bug 22007: Generated with add_missing_filters.pl
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit a8fa74ab02d037d059e4bf78b74232aeba219212
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Dec 14 17:34:52 2018 -0300
Bug 22007: Also handle Price and HtmlTags
Those 2 filters should return safe output as well
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 912fb42458a422248986c74fd8a1fd92df531fb5
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Dec 14 17:29:18 2018 -0300
Bug 22007: Handle safe filtered output (KohaDates)
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 5d49ea039c981ee73085c70b326ea47c29bee0ba
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Dec 14 17:20:52 2018 -0300
Bug 22007: Remove html filters when KohaDates called with a parameter
Bug 13618 took care of the KohaDates output but not if it is called
with a parameter (eg. [% var | $KohaDates with_hours => 1 %]).
We could avoid unnecessary processing by removing the extra html filter.
Patch generated with the following command:
% perl -p -i -e 's/KohaDates([^%\|]*)\s?\|\s?html\s?/KohaDates $1/g' **/*.inc **/*.tt
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit a440f6a4102f73073c76a31ad2d015be2af8ef48
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Dec 5 18:17:14 2018 -0300
Bug 21928: (bug 18789 follow-up) Fix CircAutoPrintQuickSlip=clear
caused by commit 105b3e10e8b31b7de6d733e676c3e661a39b1280
bug 18789
To recreate:
1 - Set CircAutoPrintQuickSlip to 'clear'
2 - Bring up a patron in circulation
3 - Click in checkout box and hit enter to submit empty
4 - Patron is partially loaded
5 - Apply patch
6 - Restart all the things
7 - Test again
8 - Patron is cleared correctly
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit e1ae3036e63db085a0e23d1619c44b0b8e91673a
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date: Tue Oct 23 00:06:27 2018 +0000
Bug 16939: (follow-up) Adding missing bracket
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 364c0d6bc56fc1cb5e6721e2ae3e62be98109a60
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue May 29 18:09:44 2018 +0000
Bug 16939: (follow-up) Correction for orderreceive.tt
This patch makes a change to orderreceive.tt which corresponds to the
changes made in the previous patch.
To test, apply the patch and set the AcqCreateItem system preference to
"receiving an order."
- Go to Acquisitions -> Vendor -> Receive shipment.
- Submit the "Receive a new shipment" form.
- Click "Receive" for an order line.
- Fill out the item form and click "Add item."
- The table of existing items should display correctly, with a single
"Actions" column containing an "Edit" and "Delete" button.
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit f3011690fc24dae2c39c2afd4d13afb43ebaecc4
Author: Aleisha <aleishaamohia at hotmail.com>
Date: Tue Jul 19 05:03:45 2016 +0000
Bug 16939: Making all 'add to basket' actions buttons
Edit: Fixing 'clas' typo in addorderiso2709.tt
Edit: Adding actions class to td
Edit: Fixing js error
Edit: circ/reserveratios.tt updated so that the plus icon doesn't show
if there is no link
Edit: fixing logic in circ/reserveratios.tt
Edit: merge conflicts
Edit: updating buttons to bootstrap 3, which i believe fixes the problem
in comment 16
To test:
1) Go to Acqui -> find a vendor -> view a basket
2) Click add to basket -> fill in 'for an existing record' and hit search
3) 'View MARC' and 'Order' buttons should show under an Actions column with appropriate icons
4) Click Order
5) Click add item when you are redirected to the New order page (no need to fill in any details)
6) Confirm that 'Edit' and 'Delete' buttons now show under an Actions column with appropriate icons
7) Go back to your basket and click add to basket -> from a subscription (we are skipping from a suggestion because this already has a button before my patch)
8) Confirm that 'Order' shows as a button with appropriate icon
9) Go back to your basket and click add to basket -> from an external source
10) fill in any fields and click search to bring up results
11) 'Order' should now show as a button with appropriate icons. MARC and Card preview have been moved into a dropdown menu - confirm this works as expected. Links have not been changed when clicking on a row
12) Go back to your basket and click add to basket -> from a staged file
13) 'Add orders' should now show as a button with appropriate icon
14) Go back to your basket and click add to basket -> from titles with highest hold ratios
15) 'X to order' should now show as a button with appropriate icon
Sponsored-by: Catalyst IT
Signed-off-by: Nicole C Engard <nengard at bywatersolutions.com>
Followed test plan, works as expected.
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 94bdfc2beee9da1ed3b8159e211272a42d01e4fa
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Thu Nov 29 12:15:33 2018 -0300
Bug 21909: Add return type explanation to POD
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit d3ff671f215398ad51a6ce550c33c0c6ca3aa30a
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Thu Nov 29 12:10:21 2018 -0300
Bug 21909: Make Koha::Account::outstanding_* preserve context
This patch modifies the methods so they preserve the caller's context
(list and scalar).
To test:
- Apply the first patch
- Run:
$ kshell
k$ prove t/db_dependent/Koha/Account.t
=> FAIL: outstanding_credits and outstanding_debits tests fail
- Apply this patch
- Run:
k$ prove t/db_dependent/Koha/Account.t
=> SUCCESS: We are so happy now :-D
- Sign off :-D
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 85c474e59761e2bb27d9921180752249b5edca9e
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Thu Nov 29 12:08:03 2018 -0300
Bug 21909: Unit tests
This patch introduces regression tests for the behaviour to be
introduced. Both outstanding_credits and outstanding_debits methods
should return a Koha::Account::Lines object in scalar context, and a
list of Koha::Account::Line objects in list context.
To test:
- Apply this patch
- Run
$ kshell
k$ prove t/db_dependent/Koha/Account.t
=> FAIL: The current behaviour doesn't match the described
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 8748d801099e1c4e4f8f845a69d1cdba4a21e7aa
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Dec 11 12:28:53 2018 -0300
Bug 21817: Fix 2 failing tests
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit ca124b5c14a3f0a34fafe307fec9ade4008eaa41
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Nov 12 18:21:58 2018 -0300
Bug 21817: Centralize the mock of userenv from tests
This patch adds a new method mock_userenv from t::lib::Mocks in order to
simplify the mock of the userenv.
Test plan:
prove all the test files modified by this patch
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
-----------------------------------------------------------------------
Summary of changes:
Koha/Account.pm | 18 ++++--
catalogue/MARCdetail.pl | 3 +-
catalogue/labeledMARCdetail.pl | 3 +-
circ/circulation.pl | 1 +
.../intranet-tmpl/prog/css/src/staff-global.scss | 2 +-
koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 2 +-
.../intranet-tmpl/prog/en/includes/circ-menu.inc | 2 +-
koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 2 +-
.../prog/en/modules/acqui/addorderiso2709.tt | 8 ++-
.../intranet-tmpl/prog/en/modules/acqui/basket.tt | 24 ++++----
.../prog/en/modules/acqui/lateorders.tt | 2 +-
.../prog/en/modules/acqui/neworderbiblio.tt | 13 ++---
.../prog/en/modules/acqui/neworderempty.tt | 3 +-
.../prog/en/modules/acqui/newordersubscription.tt | 8 +--
.../prog/en/modules/acqui/orderreceive.tt | 7 +--
.../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 4 +-
.../prog/en/modules/acqui/z3950_search.tt | 29 ++++++----
.../prog/en/modules/admin/aqbudgetperiods.tt | 2 +-
.../prog/en/modules/admin/aqbudgets.tt | 4 +-
.../prog/en/modules/admin/categories.tt | 4 +-
.../prog/en/modules/catalogue/issuehistory.tt | 8 +--
.../prog/en/modules/catalogue/search-history.tt | 8 +--
.../prog/en/modules/circ/bookcount.tt | 2 +-
.../prog/en/modules/circ/circulation.tt | 2 +-
.../prog/en/modules/circ/reserveratios.tt | 16 +++++-
.../prog/en/modules/ill/ill-requests.tt | 4 +-
.../prog/en/modules/members/accountline-details.tt | 4 +-
.../prog/en/modules/members/boraccount.tt | 4 +-
.../prog/en/modules/members/mancredit.tt | 4 +-
.../prog/en/modules/members/maninvoice.tt | 4 +-
.../prog/en/modules/members/moremember-print.tt | 2 +-
.../prog/en/modules/members/notices.tt | 2 +-
.../intranet-tmpl/prog/en/modules/members/pay.tt | 8 +--
.../prog/en/modules/members/paycollect.tt | 2 +-
.../prog/en/modules/members/readingrec.tt | 8 +--
.../en/modules/reports/guided_reports_start.tt | 4 +-
.../prog/en/modules/reserve/request.tt | 2 +-
.../prog/en/modules/tools/batch_delete_records.tt | 2 +-
koha-tmpl/intranet-tmpl/prog/js/additem.js | 7 +--
.../bootstrap/en/modules/opac-course-details.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/opac-main.tt | 2 +-
.../bootstrap/en/modules/opac-memberentry.tt | 2 +-
.../bootstrap/en/modules/opac-search-history.tt | 8 +--
.../opac-tmpl/bootstrap/en/modules/opac-user.tt | 6 +-
.../opac-tmpl/bootstrap/en/modules/sco/sco-main.tt | 4 +-
t/Budgets/CanUserModifyBudget.t | 18 ++----
t/Budgets/CanUserUseBudget.t | 13 +----
t/Circulation_barcodedecode.t | 4 +-
t/LangInstaller/templates/simple.tt | 1 +
t/db_dependent/Acquisition/NewOrder.t | 10 ++--
t/db_dependent/ArticleRequests.t | 16 +-----
t/db_dependent/Bookseller.t | 6 +-
t/db_dependent/Budgets.t | 18 +++---
t/db_dependent/Circulation.t | 5 +-
t/db_dependent/Circulation/IsItemIssued.t | 10 +---
.../Circulation/IssuingRules/maxsuspensiondays.t | 10 +---
t/db_dependent/Circulation/MarkIssueReturned.t | 3 +-
t/db_dependent/Circulation/SwitchOnSiteCheckouts.t | 3 +-
t/db_dependent/Circulation/TooMany.t | 4 +-
t/db_dependent/Circulation/issue.t | 31 ++++------
t/db_dependent/DecreaseLoanHighHolds.t | 4 +-
.../Holds/DisallowHoldIfItemsAvailable.t | 4 +-
t/db_dependent/Holds/RevertWaitingStatus.t | 8 +--
t/db_dependent/Koha/Account.t | 20 +++++--
t/db_dependent/Koha/Items.t | 3 +-
t/db_dependent/Koha/Object.t | 5 +-
t/db_dependent/Koha/Patron/Modifications.t | 15 +----
t/db_dependent/Koha/Patrons.t | 59 ++++++--------------
t/db_dependent/Koha/Reviews.t | 14 +----
t/db_dependent/Labels/t_Label.t | 3 +-
t/db_dependent/Letters.t | 18 ++----
t/db_dependent/Letters/TemplateToolkit.t | 4 +-
t/db_dependent/MarcModificationTemplates.t | 20 +------
t/db_dependent/Members.t | 19 +------
t/db_dependent/Members/Attributes.t | 6 +-
t/db_dependent/Patron/Borrower_Discharge.t | 18 ++----
t/db_dependent/Patron/Borrower_PrevCheckout.t | 8 +--
t/db_dependent/PatronLists.t | 4 +-
t/db_dependent/Reserves.t | 4 +-
t/db_dependent/Template/Plugin/Branches.t | 3 +-
t/db_dependent/Utils/Datatables_Members.t | 14 +----
t/db_dependent/Utils/Datatables_Virtualshelves.t | 8 ++-
t/db_dependent/rollingloans.t | 4 +-
t/lib/Mocks.pm | 25 +++++++++
t/lib/QA/TemplateFilters.pm | 24 +++++++-
t/template_filters.t | 45 ++++++++++++++-
87 files changed, 355 insertions(+), 416 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list