[koha-commits] main Koha release repository branch 16.11.x updated. v16.11.10-20-g9793ba8
Git repo owner
gitmaster at git.koha-community.org
Tue Aug 1 08:00:16 CEST 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, 16.11.x has been updated
via 9793ba80e7879d06d0231c787b12fd3d1f9c8ef5 (commit)
via 3ddac60248fbf7d18b6fda98648192cc73d696d7 (commit)
via 489794bbe9306fc2f6af59676d605624b4edd5a4 (commit)
via 18d8784cf022312dc536c3d336ee4f3f1613e386 (commit)
via 22422d982e7d46d52090e6189ce89856c493b8da (commit)
via e1f0fa8eac9135f6b303b1404c741f1bc8302811 (commit)
via d3d68c2a0fa272d5a4e9ba144b4d93730a2ad691 (commit)
via 1fdcd9769f75b3c6b9148addfdf96e814f703f24 (commit)
via 9aa31608ab00841dd62933df27e50a62c07e177e (commit)
via 07014d47d09827f9b2b54798fe57a1cc2197a5cd (commit)
via be80afb95b9e698bd127caed3605b17cccd4b744 (commit)
via 1abd587592b89376796b012756fce81cd1f8c48f (commit)
via 653be0d9271fb332cb4a50ffee0b9bc4661d928b (commit)
via 7c9dfb157181d43d7c67f7a2ce0b8c4496e120ae (commit)
via cbbb54fd9aee64f89cc25bb9a88ded21a49c8f13 (commit)
via 87db7d92ac777c5d9c369efebfd9e6c6d6ae07de (commit)
via 656081fb33ed58a9e7188fa7c3a83d43e32f506a (commit)
via a7817b76bcab48ee2aee14159b7813c81d7e95e1 (commit)
via cf82a24b96bee57d3cf19e3c1fd55673b3a6ebee (commit)
via 6afabe33596f3558c115ec4254c41a3931509b7c (commit)
from 0d345348ed7d024427cbd8d6bb81107cba81da9d (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 9793ba80e7879d06d0231c787b12fd3d1f9c8ef5
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Jul 28 11:38:33 2017 +0000
Bug 18367 - (QA Followup) Only warn if doing a lookup and not having an item
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 1b73cae6eb4ce7e7ca675d6db84fe8ce0cd2f499)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 1da77ea584bcc2a2878106b6bc174b21bb0837ff)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 3ddac60248fbf7d18b6fda98648192cc73d696d7
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Tue Apr 11 16:09:27 2017 -0400
Bug 18367 - Fix untranslatable string from Bug 18264
Restore display of message when no barcode found
To test:
1 - Go to course reserves
2 - Add an item to a course
3 - Try adding an invalid barcode - should get an alert
4 - Try force adding an item with itemnumber:
http://localhost:8081/cgi-bin/koha/course_reserves/add_items.pl?op=lookpup&course_id=11&itemnumber=1234523546
5 - Should recieve an error
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 1fc3751804146e92c0d8d85517ffcd6ec338808e)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 456e849ec29e9a5b1499ea8e492dc157b381f8d5)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 489794bbe9306fc2f6af59676d605624b4edd5a4
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Jul 28 11:58:24 2017 +0200
Bug 18991: [QA Follow-up] Use schema txn_begin and txn_rollback
We also need just one rollback at the end here.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit e5e5402f36c923775b341bd1900aa6468d42aa9a)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 9908a18e927c8b6f1d8c8959d070605f0680afa1)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 18d8784cf022312dc536c3d336ee4f3f1613e386
Author: Lari Taskula <lari.taskula at jns.fi>
Date: Thu Jul 27 14:56:18 2017 +0000
Bug 18991: Fix cleanup in t/db_dependent/Log.t
There is an action_logs entry via logaction() without transaction to be rolled
back in t/db_dependent/Log.t. This leaves an entry in action_logs after
the test is over.
To replicate:
1. prove t/db_dependent/Log.t
2. Observe a new entry in action_logs table
To test:
1. Apply patch
2. prove t/db_dependent/Log.t
3. Observe there are no new entries in action_logs
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit f49f5a67d3512ea75d92cb551ebd79a9de7e53d7)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 2af6365fc66a0dcb6246d90432c3998bac8bf43f)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 22422d982e7d46d52090e6189ce89856c493b8da
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Jul 28 07:56:21 2017 +0200
Bug 19000: Fix typo in closing p tag for items
Close the p tag and add a br tag to visually divide the two sections
Data problems and Warnings regarding system configuration.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Discovered the problem when testing a duplicate key in deleteditems.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 3c87b6f387831053e01ecc86b91d61669af9696b)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 37097ee7f6f462193eefd4d51d4142b6ce59a8a9)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit e1f0fa8eac9135f6b303b1404c741f1bc8302811
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Jul 24 14:25:21 2017 -0300
Bug 18545: Re-add call to enableCheckboxActions
This call is used to refresh the page correctly
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 37fc0d817d46d21897015a8e1df754b59ba477a6)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 2586f7f8462a28dc7f3078576ac2b9faa40e426c)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit d3d68c2a0fa272d5a4e9ba144b4d93730a2ad691
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Jun 9 15:50:41 2017 +0000
Bug 18545 [Follow-up] Remove use of onclick from OPAC Cart
This patch makes a few corrections:
- Use 'e.preventDefault()' instead of 'return false' in changed
sections.
- Modify the event handler on checkboxes to successfully handle the
un-check action as well as the check action. (QA comment 5).
To test, follow the original test plan.
Signed-off-by: Aleisha Amohia <aleishaamohia at hotmail.com>
Signed-off-by: Jesse Maseto <jesse at bywatersolutions.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 04a601ef659c64446790758ebbe369a2ce090875)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 970442bc39583a0491120fa60816ec4d819a7653)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 1fdcd9769f75b3c6b9148addfdf96e814f703f24
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date: Fri May 5 03:58:49 2017 +0000
Bug 18545: Remove use of onclick from OPAC cart
To test:
1) Apply patch and add one or more items to your cart
2) Confirm that clicking the following things still works as expected:
- more details
- brief display
- send
- download
- print
- select all
- clear all
- selecting by clicking checkbox
- remove title
- add title to list
- place hold
- add tag
- empty and close
Sponsored-by: Catalyst IT
Followed test plan, works as expected. Resolves issue with two
print dialogues from Bug 18544.
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 1b4d4f989b1d6c589a08f21ce19a48dca9072ec7)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 38597cee18757669e450b8ce2d0941ee7a97173b)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 9aa31608ab00841dd62933df27e50a62c07e177e
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Mon May 15 10:38:43 2017 +0200
Bug 18605: Remove TRUNCATE from C4/HoldsQueue.pm
Replaces TRUNCATE by DELETE, since truncate implicitly commits. We don't
need to do that here. (Would complicate testing it too.)
Fixes typo disablig.
Add a simple test to HoldsQueue.t.
Test plan:
Run t/db_dependent/HoldsQueue.t
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit db64c94953be772fb316d508fdfffd374ea1d835)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit bede0cc328f6acff69489fe3139d64c35eb7b589)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 07014d47d09827f9b2b54798fe57a1cc2197a5cd
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Thu Jul 20 16:08:59 2017 +0200
Bug 18965 - branch transfer limits pagination save bug
In branch transfer limits, tables are paginated with 20 rows by default.
The bug is that datatable not only hides rows, they are not in form.
So when submitting form, rows not visible are erased.
Test plan :
Wihout patch :
- Create 22 branches, you can hack the creation form by manualling calling URL : /cgi-bin/koha/admin/branches.pl?op=add_validate&branchcode=Bxx&branchname=Bxx
- Go to Administration > Library transfer limits
- You see table first page : only 20 first rows are shown
- You see all checkboxes are checked
- Go to second page of this table
- Save
=> You see table first page with all checkboxes unchecked
With patch the is no pagination, all checkboxes are shown when you save
Signed-off-by: Axelle Clarisse <axelle.clarisse at univ-amu.fr>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 7a306d72ab98f2abf2266716761820f1098ede9b)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit ca7f2f5aa48d8d5136029d10d8c15ffacf010103)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit be80afb95b9e698bd127caed3605b17cccd4b744
Author: Lari Taskula <lari.taskula at jns.fi>
Date: Mon Jul 24 18:30:10 2017 +0300
Bug 18977: Rollback branch in t/db_dependent/SIP/Message.t
To test:
1. Before applying patch, check the amount of branches in database
2. prove t/db_dependent/SIP/Message.t
3. See that a new branch is stored
4. Apply patch
5. prove t/db_dependent/SIP/Message.t
6. See that a new branch is no longer stored
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 139b66f65611cff0a2551662e0fd5c2e50b4c10f)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 5b71a4150571b0d9013341b6f64e41f12a7f1f29)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 1abd587592b89376796b012756fce81cd1f8c48f
Author: Marc Véron <veron at veron.ch>
Date: Wed Jun 21 09:47:13 2017 +0200
Bug 18832: Missing space between icon and label in button 'Patron lists'
On page Home > Patrons the button 'Patron lists' misses a space between
icon and text. This patch adds it to make the button display like the other
ones.
To test, apply patch and verify that the button displays as expected.
Signed-off-by: fcouffignal <fcouffignal at gmail.com>
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 85b895c2dfdf9499fdb12bd108c740144597c89e)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 7a9bd6247b2bb079837f170179e12d731222fb65)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 653be0d9271fb332cb4a50ffee0b9bc4661d928b
Author: Chris Kirby <chris.kirby at ilsleypubliclibrary.org>
Date: Wed Jun 21 18:27:21 2017 +0000
Bug 18839: Suggestion.pl spelling mistake
On the suggestion management page, 'unknown' is spelled 'unkown'
This patch corrects this spelling mistake in
suggestion/suggestion.pl
koha-tmpl/intranet-tmpl/prog/en/include/strings.inc
koha-tmpl/intranet-tmpl/prog/en/include/search_indexes.inc
Signed-off-by: Lee Jamison <ldjamison at marywood.edu>
Signed-off-by: sonia BOUIS <sonia.bouis at univ-lyon3.fr>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit afddf4145fbbfd978e4c5cd22f0ae2cbbef70560)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 831abee885ece915355426c8c13e756754d3e942)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 7c9dfb157181d43d7c67f7a2ce0b8c4496e120ae
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date: Mon Jul 10 02:31:22 2017 +0000
Bug 18918: Disable CSV option if no CSV profiles exist
To test:
1) Confirm you have no MARC CSV profiles (tools -> csv profiles)
2) Go to Tools -> Export data
3) Select the CSV file format for biblios
4) Notice the CSV profile dropdown shows up but the dropdown is empty
5) Click the Export button, notice Koha breaks
6) Go back and apply the patch, refresh
7) Notice the CSV option is now disabled in the file format menu
8) If you hover over CSV, an appropriate message should show explaining
why it is disabled
9) Create a CSV profile for MARC
10) Go back to Export and you should be able to use CSV now without
problem
Sponsored-by: Catalyst IT
Signed-off-by: Lee Jamison <ldjamison at marywood.edu>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 7723ffdd130996ec946d5b9149f90cb0cdc447fc)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit ae341f962c0f57dd59d9807417cbd571e3f2e5b5)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit cbbb54fd9aee64f89cc25bb9a88ded21a49c8f13
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Jul 26 13:50:14 2017 -0300
Bug 18982: Remove data in the correct order
To respect FK
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 6cb3abcbd95fe673d5b0426f5f8c23a0c7683e65)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 806357a8fc8b124e42ca877a209493d523dbd52e)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 87db7d92ac777c5d9c369efebfd9e6c6d6ae07de
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Jul 25 16:49:38 2017 -0300
Bug 18982: Create a circ rule for the data we created
No need to have a default circ cule, we create one for the categorycode
and itemtype we are going to use.
The 3 checkouts will not be rejected (5 are allowed)
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 5b84987f28b43f0c92eeff9ed1067ed61f822a4b)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 0f654af1816bffc4bada443ac0b5fa1784e5a8e9)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 656081fb33ed58a9e7188fa7c3a83d43e32f506a
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Jul 25 16:48:06 2017 -0300
Bug 18982: Create a specific itemtype for these tests
No need to require rentalcharge=0 for all itemtypes, we create our own.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit ca0568f58393cff3fce6b362e59e90daa1b1524a)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit b1664900f37ae110c629bea2c4f6307dba839dc9)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit a7817b76bcab48ee2aee14159b7813c81d7e95e1
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Jul 25 16:46:08 2017 -0300
Bug 18982: category.categorycode must be uppercase
Otherwise it is not selected in the dropdown list and the patron created
does not belong to this category
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 60478e6544ddfd37dc82829f684c3837b534d146)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 6eff76990977366704facaa26da07c250f181296)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit cf82a24b96bee57d3cf19e3c1fd55673b3a6ebee
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Jul 25 14:37:27 2017 -0300
Bug 18982: Use KOHA_INTRANET_URL instead of syspref staffClientBaseURL
That way we do not need to set the syspref, we can define it setting an
env var, like other tests.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 78d77163af407dc639764cdf1b8936b8f0f715d6)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 0ec81e6248627ecbcdfc6fe1200b8e2333ec89a3)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 6afabe33596f3558c115ec4254c41a3931509b7c
Author: Marc Véron <veron at veron.ch>
Date: Sun May 21 18:28:48 2017 +0200
Bug 16711: OPAC Password recovery: Handling if multiple accounts have the same mail address
To reproduce:
- Create 3 Accounts, login names are test01, test02, test03, Email is the same
for all.
- Go to OPAC -> Password recovery and indicate E-Mail only
- You will get an email for only one of the accounts above.
To test:
- Apply patch, restart memcached and plack
- Go to db, delete from borrower_password_recovery;
- Try steps above to reproduce. You will get an error message:
Account identification with this email address only is ambiguous.
Please use the field 'Login' as well.
- Verify that other cases work as before (provide valid / invalid login only,
provide valid email for an existing account, provide unknown email, provide
both login and email with all combinations of valid / invalid)
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Bug 16711: (QA-followup) Use count directly
See comment # 13
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 3829020c2664ec531354f78f0c04d00f5dd6795d)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 739a0f4b9b6bfba236d297608001180f4cb38af3)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
-----------------------------------------------------------------------
Summary of changes:
C4/HoldsQueue.pm | 4 +-
course_reserves/add_items.pl | 8 +-
.../prog/en/includes/patron-toolbar.inc | 2 +-
.../prog/en/includes/search_indexes.inc | 2 +-
.../intranet-tmpl/prog/en/includes/strings.inc | 2 +-
koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 3 +-
.../en/modules/admin/branch_transfer_limits.tt | 2 +-
.../en/modules/course_reserves/add_items-step1.tt | 9 +-
.../intranet-tmpl/prog/en/modules/tools/export.tt | 6 +-
.../opac-tmpl/bootstrap/en/modules/opac-basket.tt | 92 ++++++++++++++++----
.../bootstrap/en/modules/opac-password-recovery.tt | 5 +-
opac/opac-password-recovery.pl | 21 +++--
suggestion/suggestion.pl | 4 +-
t/db_dependent/HoldsQueue.t | 12 ++-
t/db_dependent/Log.t | 18 ++--
t/db_dependent/SIP/Message.t | 6 +-
t/db_dependent/selenium/basic_workflow.t | 47 ++++++----
17 files changed, 176 insertions(+), 67 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list