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 e35903574ce666bca32eb4676f311b99bb268ec2 (commit)
via 61f2ec769073709be3b688654ec355b3f4fbe522 (commit)
via 91dee226cdd089353dc71e559aa9e0b34fddf72e (commit)
via 04966a6203646cae79a48a00ef0873c1f6c64b06 (commit)
via ee6f8e186bc93df9d7943ea38f05615b2e8a813f (commit)
via 4a302b17afee055c5d123d78328d50bdc7531259 (commit)
via efc4caec968dd0394c6d1ee8a2c4be66cc697afb (commit)
via 93366e10fbe2b018caa9d6b388b74cc3ef302a86 (commit)
via 3e5cad0f03d5d90eff2d6cedfb4ff6014c0610c0 (commit)
via ffe659e92ac023d59ebe6dca40a79056d15fae87 (commit)
via 19eb17c7894c4d2d53ecfc1ad4e417aa86ab9410 (commit)
via e57b3a6c4d9bb6319f038909832281dd4a9e39e5 (commit)
from 1da47215516206d51545e5bc662a34e335127ff6 (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 e35903574ce666bca32eb4676f311b99bb268ec2
Author: Fridolin Somers <fridolin.som...@biblibre.com>
Date: Thu Jul 6 08:48:18 2017 +0200
Bug 18900: wrong number format in receiving order
Bug 18471 added number formating in order receive.
I found a bug generated by this.
Koha::Number::Price defines methods to (un)format price depending on
CurrencyFormat syspref.
The bug is that for CurrencyFormat US, some params are not defined in this
module so there are retrieved from system locale. If system locale is not
en_US, the params will be wrong. For example fr_FR will define ',' as decimal
and so saved unit price is divided by 1000.
To recreate:
- On a server with locale 'fr_FR'
- With Plack mode
- Set CurrencyFormat on 'US'
- Open a basket
- Place an order for an item
- Close basket
- Receive order with changing 'Actual Cost' to '1,234'
- Note the 'Actual Cost' is now '1.23'
- Run unit test t/Number/Price.t without and with patch
Signed-off-by: Katrin Fischer <katrin.fischer...@web.de>
Signed-off-by: Tomas Cohen Arazi <tomasco...@theke.io>
Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org>
commit 61f2ec769073709be3b688654ec355b3f4fbe522
Author: Tomas Cohen Arazi <tomasco...@theke.io>
Date: Wed Aug 9 12:01:17 2017 -0300
Bug 18900: (QA followup) Make tests conditional to locale existence
It is important to highlight that tests have been skipped instead of having
them pass
on the absence of the required fr_FR.UTF-8 locale installed on the system.
This patch does that check and effectively skips them.
Signed-off-by: Tomas Cohen Arazi <tomasco...@theke.io>
Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org>
commit 91dee226cdd089353dc71e559aa9e0b34fddf72e
Author: Fridolin Somers <fridolin.som...@biblibre.com>
Date: Thu Jul 6 08:44:51 2017 +0200
Bug 18900: add UT to Number/Price.t
This patch adds unit tests to t/Number/Price.t in order to valid the
problem.
Signed-off-by: Katrin Fischer <katrin.fischer...@web.de>
Signed-off-by: Tomas Cohen Arazi <tomasco...@theke.io>
Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org>
commit 04966a6203646cae79a48a00ef0873c1f6c64b06
Author: Jonathan Druart <jonathan.dru...@bugs.koha-community.org>
Date: Thu Aug 10 13:15:27 2017 -0300
Bug 5471: Use uri_escape_utf8 to handle utf8 chars correctly
Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org>
Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org>
commit ee6f8e186bc93df9d7943ea38f05615b2e8a813f
Author: Owen Leonard <oleon...@myacpl.org>
Date: Fri Jun 9 12:29:58 2017 +0000
Bug 5471 - Quotes in tags fail
This patch makes changes to the tag moderation template and JavaScript
to fix handling of tags with double or single quotes. This patch also
moves the tags moderation JavaScript out of the template and into a
separate JS file.
To test you should have multiple tags awaiting moderation, including
tags which contain double and single quotes.
- Go to Tools -> Tags.
- In the list of tags pending approval, test approving and rejecting
tags, including those containing single or double quotes.
- The state of the "Approve" or "Reject" buttons should correctly
change according to the action you chose.
- The label in the status column should update correctly.
- In the "Check lists" form, submitting approved, rejected, and
unclassified terms should result in the correct message.
Signed-off-by: Lee Jamison <ldjami...@marywood.edu>
Works correctly based on test plan. Tested using single- and
double-quoted tags. Passes QA Tools.
Signed-off-by: Nick Clemens <n...@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org>
commit 4a302b17afee055c5d123d78328d50bdc7531259
Author: Marcel de Rooy <m.de.r...@rijksmuseum.nl>
Date: Thu Jun 22 10:14:29 2017 +0200
Bug 18980: Show distinction between shared and private lists in staff
Just as we show this distinction in OPAC, this patch adds a type column
in the Your lists tab that displays Private or Shared. It always contains
Public in the other tab.
Test plan:
[1] Check if you see Shared for a private lists with shares in staff.
[2] Run t/db_dependent/Utils/Datatables_Virtualshelves.t
Signed-off-by: Marcel de Rooy <m.de.r...@rijksmuseum.nl>
Signed-off-by: Lee Jamison <ldjami...@marywood.edu>
Signed-off-by: Marc Véron <ve...@veron.ch>
Signed-off-by: Nick Clemens <n...@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org>
commit efc4caec968dd0394c6d1ee8a2c4be66cc697afb
Author: Marcel de Rooy <m.de.r...@rijksmuseum.nl>
Date: Wed Jun 21 16:53:56 2017 +0200
Bug 18980: Remove js function Check from opac-shelves
This function only serves to check if the shelf name is not empty. It
does not even work since it incorrectly refers to f.addshelf (while it
should test #shelfname).
We can solve this and improve consistency by doing the same as in the
staff template with html5 required.
Test plan:
[1] Without this patch it was possible to add a list without a name in
OPAC (with js error: TypeError: f.addshelf is undefined).
[2] With this patch, verify that you cannot do this anymore.
Signed-off-by: Marcel de Rooy <m.de.r...@rijksmuseum.nl>
Signed-off-by: Lee Jamison <ldjami...@marywood.edu>
Signed-off-by: Marc Véron <ve...@veron.ch>
Signed-off-by: Nick Clemens <n...@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org>
commit 93366e10fbe2b018caa9d6b388b74cc3ef302a86
Author: Marcel de Rooy <m.de.r...@rijksmuseum.nl>
Date: Wed Jun 21 16:24:57 2017 +0200
Bug 18980: Add js to dynamically show/hide the Anyone remark
If we we move from Private to Public or vice versa, this should reflect
on the Anyone remark from the first patch.
If we go back to a private list without shares, we should show it.
Handled in a js sub AdjustRemark, triggered by onchange of the category
combo or the permission combo.
Test plan:
[1] Edit a private list without shares in OPAC. Toggle category and/or
permissions. Is the remark shown or hidden accordingly?
Note: Include a test with OpacAllowPublicListCreation enabled.
[2] Edit a shared list or public list in staff. Toggle category/permissions.
You should never see the remark.
Signed-off-by: Marcel de Rooy <m.de.r...@rijksmuseum.nl>
Signed-off-by: Marc Véron <ve...@veron.ch>
Signed-off-by: Nick Clemens <n...@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org>
commit 3e5cad0f03d5d90eff2d6cedfb4ff6014c0610c0
Author: Marcel de Rooy <m.de.r...@rijksmuseum.nl>
Date: Wed Jun 21 13:13:17 2017 +0200
Bug 18980: Add remark next to "Anyone seeing this list" permission
This is a follow-up of report 18228 that simplifies the permissions for
lists. It reapplies the idea behind bug 10865 by adding a remark next to
the Anyone permission if it is not actually effective. A next patch will
make it behave dynamically.
Note: The Anyone permission is not relevant if it is a private list that
has no shares. Note that looking at the prefs OpacAllowPublicListCreation
and/or OpacAllowSharingPrivateLists is not decisive. You should look at
list permissions and shares in the database; turning off the Sharing pref
does not automatically remove all shares in the system. It only blocks
creating new shares.
We only need changes in opac-shelves.tt and virtualshelves/shelves.tt.
Test plan:
[1] Verify that you see the remark now in OPAC and staff.
Signed-off-by: Marcel de Rooy <m.de.r...@rijksmuseum.nl>
Signed-off-by: Marc Véron <ve...@veron.ch>
Signed-off-by: Nick Clemens <n...@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org>
commit ffe659e92ac023d59ebe6dca40a79056d15fae87
Author: Liz Rea <l...@catalyst.net.nz>
Date: Tue Jun 27 11:42:44 2017 +1200
Bug 18857 - Add buttons to left hand side of circ rules table
To test:
* Apply this patch
* Define some rules in the interface using the left hand buttons
* Define some rules in the interface using the right hand buttons (scroll
to see)
* Delete some rules in the interface using the left hand buttons
* Delete some rules in the interface using the right hand buttons (scroll
to see)
* Choose a rule to edit using the left hand buttons
* Edit the rule, saving using the left hand button
* Edit a rule, but clear the values using the left hand buttons
* Choose a rule to edit using the right hand buttons (scroll to see)
* Edit the rule, saving using the right hand buttons (scroll to see)
* Edit a rule, but clear the values using the right hand buttons (scroll to
see)
Signed-off-by: Guillaume <guillaume_l...@ville-limoges.fr>
Signed-off-by: Nick Clemens <n...@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org>
commit 19eb17c7894c4d2d53ecfc1ad4e417aa86ab9410
Author: Jonathan Druart <jonathan.dru...@bugs.koha-community.org>
Date: Wed Aug 9 12:59:20 2017 -0300
Bug 19067: Test Makefile.PL mapping
Signed-off-by: Katrin Fischer <katrin.fischer...@web.de>
Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org>
Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org>
commit e57b3a6c4d9bb6319f038909832281dd4a9e39e5
Author: Tomas Cohen Arazi <tomasco...@theke.io>
Date: Wed Aug 9 12:27:00 2017 -0300
Bug 19067: Map clubs/ into INTRANET_CGI_DIR in Makefile.PL
This patch adds the required entry in Makefile.PL so the clubs/ dir is
correctly installed
during the make install step.
To test:
- Run:
$ cd kohaclone
$ perl Makefile.PL
- Follow any install method and options
- Run
$ make
$ ls blib/INTRANET_CGI_DIR/ | grep clubs
=> FAIL: No clubs dir
- Run:
$ make clean
- Apply this patch
- Run:
$ perl Makefile.PL
- Follow any install method and options
- Run
$ make
$ ls blib/INTRANET_CGI_DIR/ | grep clubs
=> SUCCESS: The clubs/ dir is correctly picked for inclussion in the
intranet cgi dir
- Sign off :-D
Signed-off-by: Katrin Fischer <katrin.fischer...@web.de>
Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org>
Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org>
-----------------------------------------------------------------------
Summary of changes:
C4/Utils/DataTables/VirtualShelves.pm | 1 +
Koha/Number/Price.pm | 3 +
Makefile.PL | 1 +
.../prog/en/modules/admin/smart-rules.tt | 17 +-
.../intranet-tmpl/prog/en/modules/tags/review.tt | 216 ++++----------------
.../prog/en/modules/virtualshelves/shelves.tt | 59 +++++-
.../virtualshelves/tables/shelves_results.tt | 2 +
.../intranet-tmpl/prog/js/pages/tags-review.js | 162 +++++++++++++++
.../opac-tmpl/bootstrap/en/modules/opac-shelves.tt | 59 ++++--
.../opac-article-request-cancel.pl => t/Makefile.t | 49 +++--
t/Number/Price.t | 22 +-
tags/review.pl | 9 +-
12 files changed, 356 insertions(+), 244 deletions(-)
create mode 100644 koha-tmpl/intranet-tmpl/prog/js/pages/tags-review.js
copy opac/opac-article-request-cancel.pl => t/Makefile.t (53%)
mode change 100755 => 100644
hooks/post-receive
--
main Koha release repository
_______________________________________________
koha-commits mailing list
koha-commits@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-commits
