[koha-commits] main Koha release repository branch master updated. v18.11.00-586-gbee15e6
Git repo owner
gitmaster at git.koha-community.org
Tue Feb 26 15:54:43 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 bee15e627f4d68c177fbe9f4e6774d679df6c346 (commit)
via e34a4b97ce4b48463fb6e640bfd6872c30fbe162 (commit)
via 0375414c04e97ce21270c114311a3d96403f8da5 (commit)
via 8bbfd0c027861764ec0e256e0f43b020da8f8af9 (commit)
via 2a58e32f7d506ee87a20d50a53f497e18fb7cf13 (commit)
via ee9f4aed8b830bc2960fcc9a4f5d4c2487d2124f (commit)
via c63e73e237b93dbbe19f9ad1607f6d5d4d1b739c (commit)
via c72961082417447bb4bdc335512554bf3da1f0a6 (commit)
via 31c29fd31f557306233e6a2936148a5bb10b89a1 (commit)
via e47fa012f6e1ecf94712e0cb759625f136703c03 (commit)
via 7c99f79dda9c8ea3fcea053d191e9da5d3f6af78 (commit)
via 0b61c8e5d05dcdb3acd4b6772b7fc51e66653a0a (commit)
via eb62686630ec89d61fea048d645d333e6049ca98 (commit)
via b46fff6ce0c09a3d076273fd74af93e50b78b725 (commit)
via 677fd902f377ef81b6623545f0e67bb10af64e93 (commit)
via fb4707b97cec006e0e6f5c4b4dd430146e97f16a (commit)
via dd8749661ce7e48e86fc4eeba3c7c42e0321184e (commit)
via e3212c8a969ff17783e50d564aaa412bd01a99b1 (commit)
via 4585228ea9b5cc407dcec8e4bae499d59007ea96 (commit)
via 54fd0718da1bd27531c7f3ac4ea16d04fb15e634 (commit)
via e99a6de09335fdbe227292835b5231b13d9c1f18 (commit)
via 831531d3bbd0e440693595d0b4fadc704b020d68 (commit)
via 7128db531c18d3c75a4bad3424bd77732c0d4687 (commit)
from f0aa1c06a100108b66cd58cb3614915fc589f13e (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 bee15e627f4d68c177fbe9f4e6774d679df6c346
Author: Owen Leonard <oleonard at myacpl.org>
Date: Wed Jun 27 17:01:02 2018 +0000
Bug 21870: Convert browser alerts to modals: OPAC user summary
This patch updates the user summary page in the OPAC so that JavaScript
alerts are replaced with Bootstrap modals. This provides us the ability
to more carefully control the content of confirmation dialogs and their
control buttons.
A global function for defining a modal confirmation boxes has been
added, to which one can pass:
- The modal title
- Body
- Text for submit and cancel buttons
- A callback function to trigger on submit
To test, apply the patch and clear your browser cache if necessary.
- Log in to the OPAC as a user who has holds and article requests.
- Test the following interactions, both the confirmation and cancel
options for each:
- Cancel a hold
- Suspend all holds
- Resume all holds
- Cancel an article request
Signed-off-by: Jose-Mario Monteiro-Santos <jose-mario.monteiro-santos at inLibro.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit e34a4b97ce4b48463fb6e640bfd6872c30fbe162
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Tue Feb 26 09:34:11 2019 -0500
Bug 22300: Compiled CSS
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 0375414c04e97ce21270c114311a3d96403f8da5
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon Feb 11 15:09:36 2019 +0000
Bug 22300: Staff search results: Opt groups in 'sort' pull down are not well formatted
This patch adds some CSS to style the staff client search results sort
menu headings. Formerly these were <optgroup> tags with a default
browser style.
To test, apply the patch and regenerate the staff client CSS.
- Perform a catalog search in the staff client.
- On the search results page, test the "Sort" menu. Confirm that the
menu headers more clearly indicate the sections.
- Test the "Add to list" button menu too, where the same style will be
in use.
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 8bbfd0c027861764ec0e256e0f43b020da8f8af9
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Feb 15 10:38:14 2019 -0300
Bug 21206: Fix SwitchOnSiteCheckouts.t
Fix conflict with
commit f8544ba5799c457057d42aefc63c88e15a08b096
Bug 21999: Move attributes to a variable to not dup them
Thanks tests!
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 2a58e32f7d506ee87a20d50a53f497e18fb7cf13
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Tue Jan 15 16:32:57 2019 -0300
Bug 21206: (QA follow-up) Rebase problem and leftover mocked GetItem
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit ee9f4aed8b830bc2960fcc9a4f5d4c2487d2124f
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Tue Dec 4 11:40:17 2018 +0000
Bug 21206: (follow-up) Fix Circulation.t
Test plan:
prove t/db_dependent/Circulation.t
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit c63e73e237b93dbbe19f9ad1607f6d5d4d1b739c
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Aug 7 12:55:52 2018 -0300
Bug 21206: Fix Returns.t
we are calling several times effective_itemtype
Must be fixed later
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit c72961082417447bb4bdc335512554bf3da1f0a6
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Aug 7 12:52:28 2018 -0300
Bug 21206: Remove GetItem
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 31c29fd31f557306233e6a2936148a5bb10b89a1
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Aug 6 19:50:41 2018 -0300
Bug 21206: Replace C4::Items::GetItem
Note: This is here for information purpose, feel free to test it if you
wan to play with it.
TODO: C4::Reserves::_get_itype is not longer in use
No more GetItem must be returned by:
git grep GetItem|grep -v GetItemsAvailableToFillHoldRequestsForBib|grep
-v GetItemsForInventory|grep -v GetItemsInfo|grep -v
GetItemsLocationInfo|grep -v GetItemsInCollection|grep -v
GetItemCourseReservesInfo|grep -v GetItemnumbersFromOrder|grep -v
GetItemSearchField|grep -v GetItemTypesCategorized|grep -v
GetItemNumbersFromImportBatch|cut -d':' -f1|sort|uniq
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit e47fa012f6e1ecf94712e0cb759625f136703c03
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Fri Feb 22 11:31:52 2019 -0300
Bug 22397: Wrong message in koha-sip --start
This patch makes koha-sip --start calls mention 'SIP server' instead of
the wrong 'Zebra daemon'.
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 7c99f79dda9c8ea3fcea053d191e9da5d3f6af78
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Wed Feb 20 19:55:36 2019 +0000
Bug 18251: (follow-up) fix rebase error
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 0b61c8e5d05dcdb3acd4b6772b7fc51e66653a0a
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Tue Mar 28 14:21:29 2017 -0400
Bug 18251: (QA follow-up) Add 'renew' operation and check renewal vs checkout
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit eb62686630ec89d61fea048d645d333e6049ca98
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Mon Mar 20 10:48:21 2017 -0400
Bug 18251: (QA follow-up) Add alerts for all SCO actions
To test:
Add sound alerts for sco-alert-warning
Test various actions (return,renew) and verify success/failure notices
and sounds
Note additional classes (return,renew,issue) to allow for more
specificity of sounds alerts
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit b46fff6ce0c09a3d076273fd74af93e50b78b725
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Mon Mar 20 06:50:40 2017 -0400
Bug 18251: (QA follow-up) Add alert box to checkout message
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 677fd902f377ef81b6623545f0e67bb10af64e93
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Mon Mar 13 14:30:42 2017 +0000
Bug 18251: SCO alerts - need a trigger for successful checkouts
This patch adds simple text and a div to allow for sounds to be
configured upon successful SCO checkout
To test:
1 - Enable sco module
2 - Enable AudioAlerts
3 - Define alert with
Selector: .sco-alert-success
Sound:http://localhost:8081/intranet-tmpl/prog/sound/opening.ogg
4 - Checkout to patron using SCO
5 - Note only feedback is a addition of item to checkouts list
6 - Apply patch
7 - Checkout ot patron via SCO
8 - You should hear the sound specified above
9 - You should also see a note: Item checked out
Followed test plan, works as expected.
(Works with external sound only, see Bug 16732)
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit fb4707b97cec006e0e6f5c4b4dd430146e97f16a
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Wed Feb 20 20:00:01 2019 +0000
Bug 22378: Fix audio alerts on SCO
Note: The SCO only supports sounds with a full URL, not KOha built in sounds
To test:
1 - Enable audio alerts
2 - Enable SCO
3 - Note JS error on loading the alerts
4 - Apply patch
5 - No more error
6 - Test with bug 18251
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit dd8749661ce7e48e86fc4eeba3c7c42e0321184e
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Mon Feb 25 18:21:26 2019 +0000
Bug 22411: Date and time in log viewer should respect
Test plan:
Go to log viewer and show some log
-- without patch the date ant time in first column is formatted as
yyyy-mm-dd hh:mm
-- with patch the date is formatted according to your dateformat system
preference
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit e3212c8a969ff17783e50d564aaa412bd01a99b1
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Thu Feb 21 17:21:58 2019 +0100
Bug 15149: Serial test prediction pattern does not consider end date
To reproduce:
1) add a serial.
2) set first issue = today
3) set frequency = 1/month
4) dont set subscription length
5) set subscription start date = today
6) set subscription start date = today + 1 year
7) set numbering pattern = Number
8) test prediction pattern.
=> Without patch : you will get a list of 1000 issues, going well beyond subscripton end date.
=> With patch : shows only the issues within the date range.
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: zhihui <zhihui at inlibro.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 4585228ea9b5cc407dcec8e4bae499d59007ea96
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Feb 22 11:06:46 2019 -0300
Bug 18957: Record the time part of the last renewed date
issues.lastreneweddate is a datetime and we could record the time part
of the date.
Test plan:
Renew an issue
note that the time part of the last renewed date is set correctly
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 54fd0718da1bd27531c7f3ac4ea16d04fb15e634
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Feb 22 11:01:38 2019 -0300
Bug 18957: Add tests
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit e99a6de09335fdbe227292835b5231b13d9c1f18
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Mon Feb 25 09:18:50 2019 +0000
Bug 14850: (QA follow-up) Remove debugging code
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 831531d3bbd0e440693595d0b4fadc704b020d68
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Fri Feb 22 07:12:10 2019 -0500
Bug 14850: Funds from inactive budgets appear in 'Funds' dropdown on acqui/invoice.pl
Test Plan:
1) Create some inactive and active budgets
2) View an invoice in acquisitions
4) Note the shipping fund dropdown behaves like acqui/parcels.pl
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 7128db531c18d3c75a4bad3424bd77732c0d4687
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Fri Feb 22 12:00:35 2019 -0300
Bug 22396: Make koha-sip set KOHA_HOME and KOHA_CONF correctly
This patch corrects a typo, and exports KOHA_CONF as other scripts do.
To test:
- Apply this patch
- Run:
$ # in kohadevbox
$ perl misc4dev/cp_debian_files.pl
- Try the new script
$ sudo koha-sip --start kohadev
=> SUCCESS: tail -f /var/log/koha/kohadev/sip* doesn't show fatal errors
anymore
- Sign off :-D
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Biblio.pm | 15 +-
C4/Circulation.pm | 316 ++++++++++----------
C4/CourseReserves.pm | 6 +-
C4/HoldsQueue.pm | 7 +-
C4/ILSDI/Services.pm | 43 +--
C4/Items.pm | 83 +----
C4/Message.pm | 2 +-
C4/Reserves.pm | 39 ++-
acqui/invoice.pl | 66 ++--
acqui/orderreceive.pl | 9 +-
catalogue/getitem-ajax.pl | 40 +--
catalogue/updateitem.pl | 2 +-
cataloguing/additem.pl | 23 +-
debian/scripts/koha-sip | 7 +-
installer/data/mysql/backfill_statistics.pl | 9 +-
.../intranet-tmpl/prog/css/src/staff-global.scss | 8 +
koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 2 +-
.../intranet-tmpl/prog/en/modules/acqui/invoice.tt | 46 ++-
.../intranet-tmpl/prog/en/modules/tools/viewlog.tt | 3 +-
.../opac-tmpl/bootstrap/en/modules/opac-user.tt | 74 ++++-
.../opac-tmpl/bootstrap/en/modules/sco/sco-main.tt | 36 ++-
koha-tmpl/opac-tmpl/bootstrap/js/global.js | 36 +++
labels/label-edit-batch.pl | 3 +-
misc/recreateIssueStatistics.pl | 22 +-
opac/opac-renew.pl | 7 +-
opac/opac-shelves.pl | 6 +-
opac/sco/sco-main.pl | 18 +-
reserve/placerequest.pl | 8 +-
serials/showpredictionpattern.pl | 2 +-
svc/checkin | 14 +-
t/db_dependent/Acquisition/CancelReceipt.t | 9 +-
t/db_dependent/Circulation.t | 19 +-
t/db_dependent/Circulation/IsItemIssued.t | 1 +
t/db_dependent/Circulation/Returns.t | 13 +-
t/db_dependent/Circulation/issue.t | 13 +-
.../Holds/DisallowHoldIfItemsAvailable.t | 15 +-
t/db_dependent/Items.t | 68 ++---
.../Items/AutomaticItemModificationByAge.t | 51 ++--
t/db_dependent/Items/DelItem.t | 10 +-
t/db_dependent/Items/MoveItemFromBiblio.t | 13 +-
t/db_dependent/Items_DelItemCheck.t | 5 +-
t/db_dependent/Reserves.t | 3 +-
tools/batchMod.pl | 8 +-
tools/inventory.pl | 6 +-
tools/viewlog.pl | 10 +-
virtualshelves/shelves.pl | 7 +-
46 files changed, 676 insertions(+), 527 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list