[koha-commits] main Koha release repository branch master updated. v18.05.00-454-g24a5b9d
Git repo owner
gitmaster at git.koha-community.org
Fri Aug 10 14:53:35 CEST 2018
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 24a5b9d700fd2d3847e6d7e16502b1c24e8e872e (commit)
via 112af732e3685bb46b227caa147e6a9aa3e6226c (commit)
via 392e0ca8f151239b600edac9fccccf81ed50f7cb (commit)
via ac54e35b20793a8a84a705acb8068589251e3e14 (commit)
via 1e3f93aa594ccf673c519573e6c7b4bfc1ba6aac (commit)
via d0e37a483cb8445c7830764eef9603694830b56d (commit)
via 91c1acd6bb99f18dc1f532414621c5554f230527 (commit)
via c659fe807671912e7e5636110e586ea23df65b69 (commit)
via 6f65887399a4bd276a5f83ed9d945e19e08036fd (commit)
via 46658a0e21594d1f7d76165d77297d4b5229fcab (commit)
via 13cc5d3161b2630027a2c04cbc11414e83a4842b (commit)
via ef58eff737b2fdcb4f97c8667e2f83e7f7aa70c7 (commit)
via ff21352a4a54a1b61f906aeffe7feef1506d4264 (commit)
via 985eb929149737571e3830c837a127ab372e42fe (commit)
via 1da481f725e65c65e386c3b742d2f1e760f21a28 (commit)
via 12ff3717283098602eb4595d6bd242f9ea888a79 (commit)
via 2acbee523fbb311a63c4e3f9326fe410cf4ff832 (commit)
via 15fd90dcbc98cae6febfeab59df679b761111d42 (commit)
via 6ff01e3543fbe6f39739b01b64d2e0073cec75d5 (commit)
via db6fc9f024080d8114564490f75ba177c8ccb640 (commit)
via 436f4b9e0eb19eea491ecc70a2a996a8297f3d33 (commit)
via 0989d37c23d7d9a775d516395dbe69339928aff9 (commit)
from d035a140b51be6f2dad8f5f760ac0e626f952be5 (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 24a5b9d700fd2d3847e6d7e16502b1c24e8e872e
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Thu Aug 9 16:08:31 2018 +0000
Bug 21195: Ignore files used for SCSS build process
koha_1 | # Failed test 'All directories should be mapped:
.sass-lint.yml,.scss-lint.yml,gulpfile.js,package.json,yarn.lock'
koha_1 | # at t/Makefile.t line 47.
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 112af732e3685bb46b227caa147e6a9aa3e6226c
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Aug 10 12:38:34 2018 +0000
Bug 20997: DBRev 18.06.00.013
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 392e0ca8f151239b600edac9fccccf81ed50f7cb
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Jul 31 16:46:23 2018 -0300
Bug 20997: Replace missing credit_applied with 'Credit Applied'
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit ac54e35b20793a8a84a705acb8068589251e3e14
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Fri Jul 27 14:55:14 2018 -0300
Bug 20997: (QA follow-up) POD fixes and offset type consistency
This patch addresses minor issues highlighted by QA.
- The POD is enhanced based on the proposal in bug 11983.
- The introduced offset type value is made consistent with the rest of
them.
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 1e3f93aa594ccf673c519573e6c7b4bfc1ba6aac
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Thu Jun 28 15:54:53 2018 -0300
Bug 20997: (follow-up) Minor POD fixes
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 d0e37a483cb8445c7830764eef9603694830b56d
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Thu Jun 28 15:52:01 2018 -0300
Bug 20997: ->apply should be applied to Koha::Account::Lines
This patch makes ->apply get passed an object set class instead of
single account lines.
The change is fully covered by tests.
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 91c1acd6bb99f18dc1f532414621c5554f230527
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Thu Jun 28 15:51:06 2018 -0300
Bug 20997: Add new offset type
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 c659fe807671912e7e5636110e586ea23df65b69
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Tue Jun 26 00:22:16 2018 +0000
Bug 20997: (follow-up) Add Koha::Account::Line->is_debit method
Test plan:
1) Apply this patch
2) prove t/db_dependent/Koha/Account/Lines.t
=> Test should pass
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 6f65887399a4bd276a5f83ed9d945e19e08036fd
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Tue Jun 26 11:52:44 2018 -0300
Bug 20997: Add Koha::Account::Line::apply method
This patch implements the ->apply() method for account lines.
It will only work on credit lines, and raise an exception otherwise.
It implements ->is_credit() as well.
To test:
- Apply this patch
- Run:
$ kshell
k$ prove t/db_dependent/Koha/Account/Lines.t
=> SUCCESS: Tests pass!
- Check all use cases are covered by the tests
- Sign off :-D
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 46658a0e21594d1f7d76165d77297d4b5229fcab
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Tue Jun 26 11:51:41 2018 -0300
Bug 20997: Add unit tests for Koha::Account::Line::apply
This patch adds unit tests for the mentioned method.
To test:
- Apply this patch
- Run:
$ khell
k$ prove t/db_dependent/Koha/Account/Lines.t
=> FAIL: The method is not already implemented!
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 13cc5d3161b2630027a2c04cbc11414e83a4842b
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Jul 11 13:35:28 2018 -0300
Bug 21125: Shortcut moredetail.pl on nonexistent biblionumber
This replaces the solution for 17.11 on bug 20927.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit ef58eff737b2fdcb4f97c8667e2f83e7f7aa70c7
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Jul 27 08:29:03 2018 +0200
Bug 20661: (QA follow-up) Add POD for output_and_exit
Resolve:
FAIL C4/Output.pm
FAIL pod
*** ERROR: Apparent command =cut not preceded by blank line in file C4/Output.pm
FAIL pod coverage
POD is missing for output_and_exit
Test plan:
Run QA tools again.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit ff21352a4a54a1b61f906aeffe7feef1506d4264
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Apr 25 17:08:42 2018 -0300
Bug 20661: Shortcut circ scripts if a blocking error appeared
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
No test plan found ;)
But tested bookcount and request-article.
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 985eb929149737571e3830c837a127ab372e42fe
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon Jun 4 18:16:54 2018 +0000
Bug 20647: (alternate) When ILL is enabled the hover effect on the ILL requests button is wrong
This alternate patch adds a new icon to the sprite image which gives
icons to the link on the staff client home page. It modifies the CSS
positioning for all the links as the new image sprite is somewhat
different.
The SVG file from which the sprite image was generated is also updated,
and the about page has been updated to give credit to the creator of the
icon.
Unrelated change: The cataloging link is moved to the second column.
Although it's probably rare for all modules to be enabled and available,
this puts the same number of links in each column.
To test, apply the patch and clear your browser cache if necessary. With
interlibrary loan enabled, view the staff client home page and confirm
that all the module links look correct, including when you hover your
mouse over them.
Confirm that the about page lists the new icon under the "licenses" tab.
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 1da481f725e65c65e386c3b742d2f1e760f21a28
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Fri May 11 08:24:06 2018 +0200
Bug 20683: Update German web installer for 18.05
Adds translations for 2 new notices CANCEL_HOLD_ON_LOST and
CHECKOUT_NOTE.
Some small changes to older notices to match them with the
English templates.
To test:
- Install German
- Run the web installer on an empty database
- Make sure all files install correctly and there are no SQL
errors
- Check notices were loaded correctly
Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 12ff3717283098602eb4595d6bd242f9ea888a79
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Aug 10 10:21:00 2018 +0000
Bug 7143: Update about page for new dev - Vassilis Kanellopoulos
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 2acbee523fbb311a63c4e3f9326fe410cf4ff832
Author: Vassilis Kanellopoulos <contact at kanellov.com>
Date: Mon Nov 9 11:20:21 2015 +0200
Bug 15136: Add homebranch of borrowed items to patron accounts tab
Test plan:
1 - View the accounts tab for a patron with fines
2 - Note there is no homebranch displayed to see where charges came from
3 - Apply patch
4 - Reload the page and note that you see the 'Home library' column
Signed-off-by: Maryse Simard <maryse.simard at inlibro.com>
Followed the test plan and it works.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 15fd90dcbc98cae6febfeab59df679b761111d42
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Thu Feb 22 11:52:14 2018 +0100
Bug 19633: Use alphanumeric error codes in upload
The error codes 1 to 7 are used in Uploader.pm or tools/upload.pl.
It would be nice to use alphanumeric codes instead.
No behavior change expected.
Test plan:
[1] Run t/db_dependent/Upload.t
[2] Verify that a regular upload with tools/upload.pl still works.
[3] Rename upload_path in your koha-conf.xml. Restart Plack, flush the cache
and try to upload to a category. Correct error message?
[4] Upload the same file twice to the same category.
Correct error message the second time?
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Brendan Gallagher <brendan at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Bug 19633: (QA follow-up) Really remove these ugly numbers
See BZ comment5. We now remove the numbers also from the constant names.
Test plan:
Read the changes.
Git grep "ERRCODE_"
Run t/db_dependent/Upload.t (Note: You may see one failure here; it is fixed
on bug 20727. So depends on who reaches master first.)
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 6ff01e3543fbe6f39739b01b64d2e0073cec75d5
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Mon Jul 2 14:08:59 2018 +0200
Bug 20468: (QA follow-up) Deactivate select/clear all for empty tab
This only pertains to the second (Processing) tab.
Test plan:
[1] Have one entry in Pending and zero in Processing.
[2] Click on Processing tab.
[3] Without this patch, you would see Select all/Clear all.
With this patch, you won't.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit db6fc9f024080d8114564490f75ba177c8ccb640
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Wed Jun 6 13:38:36 2018 +0200
Bug 20468: (follow-up) Cancel multiple items for same reason
The repeated prompts for cancelling multiple selected items are
confusing.
The wording is slightly adjusted. The reason is asked only once per
group of selected items.
Test plan:
Create three requests.
Select two requests and cancel (from top menu) for reason A.
Cancel third request (from item menu) for reason B.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 436f4b9e0eb19eea491ecc70a2a996a8297f3d33
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Jun 1 16:28:29 2018 +0000
Bug 20468: (follow-up) Changes to checkbox/menu interactions
This patch makes a couple of minor interface changes and updates the way
checkbox change events are handled:
- jQueryUI tabs initialization sets a variable for "active table" which
can be re-used by functions which affect only the visible table.
- The batch "Actions" menu is shown or hidden based on whether there
are checked items.
- The item selection tools are shown or hidden based on whether there
are rows in the table.
To test, apply the patch and test various article request actions:
- Single "process," "complete," and "cancel" operations.
- Select all/ clear all operations on both tabs.
- Batch operations with checked requests.
- Process all pending requests to confirm the selection controls for
that table are hidden.
- Complete all processing requests to confirm the selection controls
for that table are hidden.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 0989d37c23d7d9a775d516395dbe69339928aff9
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Thu Mar 22 15:47:45 2018 +0100
Bug 20468: Add multi-select to staff article request form
Adds a column with a checkbox. Adds buttons under the table for Select,
Clear and Actions menu.
An additional javascript function HandleMulti is placed between the form
and the functions handling individual requests.
Note: The Actions menu below does not contain Print slip. This does not
work in its current form. This could be handled on a separate report.
Test plan:
[1] Enable Article Requests. Add a few requests.
[2] Test the Select all / Clear all functionality on the form.
[3] Verify that the menu options Process, Complete and Cancel work as
expected both from the individual Actions menu as from the shared
Actions menu for selected requests.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Patch applies and functions as described.
Signed-off-by: Dilan Johnpullé <dilan at calyx.net.au>
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/Output.pm | 25 ++-
Koha.pm | 2 +-
Koha/Account/Line.pm | 114 ++++++++++-
Koha/Account/Lines.pm | 1 -
Koha/Exceptions/Account.pm | 66 +++++++
Koha/Uploader.pm | 14 +-
Makefile.PL | 5 +
catalogue/moredetail.pl | 3 +
circ/bookcount.pl | 31 ++-
circ/request-article.pl | 3 +
docs/history.txt | 1 +
installer/data/mysql/account_offset_types.sql | 3 +-
.../data/mysql/de-DE/mandatory/sample_notices.sql | 67 ++++---
installer/data/mysql/updatedatabase.pl | 9 +
koha-tmpl/intranet-tmpl/prog/css/mainpage.css | 58 +++---
.../prog/en/includes/account_offset_type.inc | 1 +
.../prog/en/includes/blocking_errors.inc | 4 +
koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 3 +-
.../prog/en/modules/circ/article-requests.tt | 206 +++++++++++++-------
.../prog/en/modules/circ/bookcount.tt | 10 +-
.../prog/en/modules/circ/request-article.tt | 3 +
.../intranet-tmpl/prog/en/modules/intranet-main.tt | 12 +-
.../prog/en/modules/members/boraccount.tt | 6 +-
.../intranet-tmpl/prog/en/modules/tools/upload.tt | 43 ++--
.../prog/img/staff-home-icons-sprite.png | Bin 8960 -> 10479 bytes
.../staff-home-icons-sprite.svg | 2 +-
t/db_dependent/Koha/Account/Lines.t | 146 +++++++++++++-
t/db_dependent/Upload.t | 2 +-
tools/upload.pl | 10 +-
29 files changed, 658 insertions(+), 192 deletions(-)
create mode 100644 Koha/Exceptions/Account.pm
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list