[koha-commits] main Koha release repository branch 16.11.x updated. v16.11.03-46-g2591dfa
Git repo owner
gitmaster at git.koha-community.org
Tue Feb 14 22:42:27 CET 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 2591dfa8a0df3372e96e556620ba22b5b79afccf (commit)
via 8e11d51b6eef3614c6eb77b11217b57b247d8441 (commit)
via 74018f23119d887aa5d6e4dffdf05f5d28db0a0b (commit)
via 7f4bef9bfec20529607cca635e08561fbdcc0ea1 (commit)
via dc40f04752804131de38621b1ad6646f1438a1a8 (commit)
via b441c89f4f71bb6036dcb9d2ac5a4e24392714bc (commit)
via 7e3ffc7f87b09c0b33c2f82ba04fee89e789c2d2 (commit)
via 8f086404ad5ae440ac2b92cdd494610f4c7e3ac7 (commit)
via c622e8df475f742cf95c71e09c23529659457958 (commit)
via 2e5be93600e64a431b97e3fce6fe427619e398f0 (commit)
via 448f6f5127812e23e6c9f44dda2e0228b20cb941 (commit)
via 83ec31965824b4d632bb62f5569fde430fa3858e (commit)
via f45cd420d1bed73b9a85c5260ae4a781041a6626 (commit)
via c4f977b76f171130d7f9c370ef6e27b6c0fd2384 (commit)
via cb1bc00361bf3e468470b8e1500a4e752e60d161 (commit)
via 37ad15eae7e8773ae8ee4cb342b5adf3d54d0ff0 (commit)
via 46506e215e42eaa854377337f8588436144ce1e3 (commit)
via 87edb0bdddab634598ae75db71748a446a6d37ed (commit)
via 5023593010d62cdcdb7191b7694de9ce58d5ff82 (commit)
via dfe8fd300d114e6b45fdc47d107fd56d791dd898 (commit)
via e0b64c0f4ae29eae1a7c71d3d9e328683aa51317 (commit)
via 2d363f136d8d9c4b35dfac455ea4f877fac7905d (commit)
from 3f1c6b05fa3c6c0dcbfeedf88c0c3919af54a952 (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 2591dfa8a0df3372e96e556620ba22b5b79afccf
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Tue Feb 14 22:11:51 2017 +0100
Bug 17913: Database update - Add system preference AuthorityMergeMode
commit 8e11d51b6eef3614c6eb77b11217b57b247d8441
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Wed Feb 8 20:45:51 2017 +0000
Bug 17913: [16.11.x] followup
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
commit 74018f23119d887aa5d6e4dffdf05f5d28db0a0b
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Mon Jan 23 14:06:48 2017 +0100
Bug 17913: [16.11.x] Authority merge fix
[PUSHED_17.05]
Squashed into one patch for 16.11.x
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
commit 7f4bef9bfec20529607cca635e08561fbdcc0ea1
Author: Marc Véron <veron at veron.ch>
Date: Fri Feb 10 16:07:13 2017 +0100
Bug 18095: Batch item modification: Better message if no item is modified
If no item is modified, the result page of Batch item modification says:
"item(s) modified (with fields modified)."
The message should be: "No items modified"
To reproduce:
- Go to Tools -> Batch item modification
- Put a barcode in and click Continue
- Do not make any changes and/or deselect all item(s)
- Click "Save"
=> Result message reads: "item(s) modified (with fields modified)."
To test:
- Apply patch
- Repeat steps above
- Verify that message makes sense.
NOTE: Also tested positive case with actual field change.
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit adca73545e75c31198e3d094512da7961460ed02)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit dc40f04752804131de38621b1ad6646f1438a1a8
Author: Chloe <chloealabaster at gmail.com>
Date: Thu Jan 21 03:20:58 2016 +0000
Bug 15584 - Staff client list errors are incorrectly styled
To Test-
1. In the Staff Client, go to Lists
(/cgi-bin/koha/virtualshelves/shelves.pl) and create a new list with
the same name as an existing one. --note that it has some red in it
like an error
2. apply patch
3. In the Staff Client, go to Lists
(/cgi-bin/koha/virtualshelves/shelves.pl) and create a new list with
the same name as an existing one. --note that now it should be just
yellow with black writing as an alert
Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 4bd2188affee568de81342d0af24fcf0239d9f01)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit b441c89f4f71bb6036dcb9d2ac5a4e24392714bc
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Feb 3 11:38:53 2017 +0000
Bug 18047 - JavaScript error on item search form unless LOC defined
If LOC is not present, the item search form will raise a JS error:
SyntaxError: expected expression, got '}'
This patch fixes it by handling this specific case.
Note that the "Status" column is still displayed.
Test plan:
Remove your LOC authorised values
Go on the item search form
=> You will not get the JS error and the "Shelving location" bloc is no longer
displayed. There is no need to display it if empty.
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit da3ccdc14379816ea849eeb56ab321d8e7db59a2)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 7e3ffc7f87b09c0b33c2f82ba04fee89e789c2d2
Author: Adrien Saurat <adrien.saurat at biblibre.com>
Date: Thu Dec 13 10:13:19 2012 +0100
Bug 8306: Patrons statistics, fix for patron activity choice
The "inactive" for "patron activity" choice is now effective.
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 680e6ce7d1aa53e716ea9fdab9c67e621fb828e2)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 8f086404ad5ae440ac2b92cdd494610f4c7e3ac7
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Feb 9 13:13:50 2017 +0100
Bug 18089: Remove warnings from tests using DBIx::Class fixtures
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 2e315c0cc6f31991868b17276807f28cdcce4306)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit c622e8df475f742cf95c71e09c23529659457958
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Thu Feb 9 11:48:40 2017 +0000
Bug 18089 - All XSLT testing singleBranchMode = 0 fails to show even if install has only 1 branch
Due to the way it has been implemented, singleBranchMode is set to an
empty string rather than 0 if there is only one branch. This causes any
block that tests for singleBranchMOde to be 0 to never appear.
Test Plan:
1) Apply this patch set
2) prove t/XSLT.t
Signed-off-by: Jenny Schmidt <jschmidt at switchinc.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit ed5cb5fc9727ca09deb392f4392c1aa35b4e47a5)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 2e5be93600e64a431b97e3fce6fe427619e398f0
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Thu Feb 9 11:48:08 2017 +0000
Bug 18089 - Unit test
Signed-off-by: Jenny Schmidt <jschmidt at switchinc.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 99cc3bdd0ec676d29205fb09d1a4e4b1e8889df0)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 448f6f5127812e23e6c9f44dda2e0228b20cb941
Author: Zoe Schoeler <crazy.mental.onion at gmail.com>
Date: Wed Jan 18 00:55:43 2017 +0000
Bug 17838 Availability limit broken until an item has been checked out.
TEST PLAN
1. Make sure you have no items checked out.
2. Run sudo koha-rebuild-zebra -f -v kohadev.
3. Go to search the catalog and search.
4. Check items availability and then click on limit to currently
available items.
5. This should return no results.
6. Apply patch and reload.
7. Results should show.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Attribute 14: " Specifies whether un-indexed fields should be ignored. A
zero value (default) throws a diagnostic when an un-indexed field is
specified. A non-zero value makes it return 0 hits."
From http://www.indexdata.com/zebra/doc/querymodel-zebra.html
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 543dc8e0365240441114359b7ddfa74863a318b6)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 83ec31965824b4d632bb62f5569fde430fa3858e
Author: Magnus Enger <magnus at libriotech.no>
Date: Thu Nov 10 14:32:44 2016 +0000
Bug 4126 - Exit bulkmarcimport if -a and -b given
Currently it is possible to spceify both --biblios and --authorities
as command line switches to bulkmarcimport.pl. This does not make sense
so we should exit early and explain that these switches are mutually
exclusive.
To test:
- Run one of these and check that there is no complaint about missing
options:
perl misc/migration_tools/bulkmarcimport.pl -a -b
sudo koha-shell -c "perl misc/migration_tools/bulkmarcimport.pl -a -b"
kohadev
- Observe that this displays the perldoc, but does not complain about
mutually exclusive switches.
- Apply the patch
- Rerun the command(s) from earlier.
- Verify that the script is now halted and a small explanation given.
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit dbada67196818834f158890c0c348c0259085f7e)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit f45cd420d1bed73b9a85c5260ae4a781041a6626
Author: Mason James <mtj at kohaaloha.com>
Date: Sun Jan 29 00:47:20 2017 +1300
Bug 18009 - IssueSlip.t test fails if launched between 00:00 and 00:59
to test patch...
1/ set date between 00:00 and 00:59
$ sudo date -s 'Sun Jan 29 00:41:55 NZDT 2017'
2/ run prove, see fail
$ prove -v t/db_dependent/Members/IssueSlip.t
...
t/db_dependent/Members/IssueSlip.t (Wstat: 65280 Tests: 1 Failed: 0)
Result: FAIL
3/ apply patch
4/ run prove, see pass
$ prove -v t/db_dependent/Members/IssueSlip.t
...
All tests successful.
Result: PASS
NOTE: for code obscurity you could have also done a modulus 24. ;)
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit add15799229df7a1910d759f487c0006bf3f30ae)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit c4f977b76f171130d7f9c370ef6e27b6c0fd2384
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Sat Dec 17 09:25:54 2016 -0300
Bug 17788: (MARC21) Add $9 fields to Koha-Auth-Number:w index
Looking at the default framework's fields that are linked to authority
records, there's a divergence with the Zebra index definitions.
This yields to authority usage count be incorrect for users searching
for authority records.
MariaDB [koha_kohadev]> SELECT tagfield,tagsubfield,authtypecode FROM
marc_subfield_structure WHERE authtypecode IS NOT NULL AND
authtypecode<>'' AND frameworkcode='' GROUP BY
tagfield,tagsubfield,authtypecode ;
+----------+-------------+--------------+
| tagfield | tagsubfield | authtypecode |
+----------+-------------+--------------+
| 100 | a | PERSO_NAME |
| 110 | a | CORPO_NAME |
| 111 | a | MEETI_NAME |
| 130 | a | UNIF_TITLE |
| 440 | a | UNIF_TITLE |
| 600 | a | PERSO_NAME |
| 610 | a | CORPO_NAME |
| 611 | a | MEETI_NAME |
| 630 | a | UNIF_TITLE |
| 648 | a | CHRON_TERM |
| 650 | a | TOPIC_TERM |
| 651 | a | GEOGR_NAME |
| 654 | a | TOPIC_TERM |
| 655 | a | GENRE/FORM |
| 656 | a | TOPIC_TERM |
| 657 | a | TOPIC_TERM |
| 658 | a | TOPIC_TERM |
| 662 | a | GEOGR_NAME |
| 690 | a | TOPIC_TERM |
| 691 | a | GEOGR_NAME |
| 696 | a | PERSO_NAME |
| 697 | a | CORPO_NAME |
| 698 | a | MEETI_NAME |
| 699 | a | UNIF_TITLE |
| 700 | a | PERSO_NAME |
| 710 | a | CORPO_NAME |
| 711 | a | MEETI_NAME |
| 730 | a | UNIF_TITLE |
| 796 | a | PERSO_NAME |
| 797 | a | CORPO_NAME |
| 798 | a | MEETI_NAME |
| 799 | a | UNIF_TITLE |
| 800 | a | PERSO_NAME |
| 810 | a | CORPO_NAME |
| 811 | a | MEETI_NAME |
| 830 | a | UNIF_TITLE |
| 896 | a | PERSO_NAME |
| 897 | a | CORPO_NAME |
| 898 | a | MEETI_NAME |
| 899 | a | UNIF_TITLE |
+----------+-------------+--------------+
This patch adds the missing ones to the authority number index as it is
done for the rest of the fields.
To test:
- Verify that
etc/zebradb/marc_defs/marc21/biblios/biblio-koha-indexdefs.xml
contains intries pointing the $9 subfield of all the fields in the
'tagfield' column above, to the Koha-Auth-Number:w index.
- Sign off :-D
Signed-off-by: Hugo Agud <hagud at orex.es>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 21d63c8fb0c2ae3a8ca7caaf0d4041b7189213c3)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit cb1bc00361bf3e468470b8e1500a4e752e60d161
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Thu Oct 27 15:07:29 2016 +0200
Bug 17512: Improve handling dates in C4::Items
This is a follow-up on the internal server error on 0000-00-00 in the items
column onloan. This patch deals with preventing to have such dates at all
in the date fields of items.
It is accomplished by:
[1] Adding a (private) subroutine _mod_item_dates. It takes an item hash
and replaces date values if needed.
[2] AddItem and ModItem call _koha_new_item resp. koha_modify_item. In these
routines a call to the new _mod_item_dates is inserted.
[3] Although the routine is actually private, I have added some unit tests
to Items.t.
Test plan:
[1] Add a new item. Fill a correct date in dateaccessioned and an invalid
date in Price effective from (=replacementpricedate).
[2] Verify that dateaccessioned is saved correctly and replacementpricedate
is still null (does not contain 0000-00-00).
[3] Edit the item again. Fill some text in dateaccessioned and put a correct
date in replacementpricedate. Verify the results.
[4] Run t/db_dependent/Items.t
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 137cbd8d09be549c9ae97dfad746a9c52d27b9a6)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 37ad15eae7e8773ae8ee4cb342b5adf3d54d0ff0
Author: Oleg Vasylenko <synapse.ova at gmail.com>
Date: Wed Jan 25 12:01:05 2017 +0200
Bug 17988 - Select2 prevents correct tag expand/minimize functionality
Overview:
Select2 (Bug 13501) introduced divs and inputs that broke some assumptions about the expected HTML structure.
Because of that, expanding fields to show all hidden subfields does not work properly.
Steps to Reproduce:
1. Open some book in the editor or create new (cataloguing/addbiblio.pl)
2. Try to minimize or expand fields, that have among subfields the following:
— Thesaurus driven subfield → subfield with Select2
— Hidden subfield.
Actual Results:
— some fields become hidden, some not, and vice versa
— in the console, you'll see «Uncaught TypeError: Cannot read property 'match' of null»
Expected Results:
— all subfields should minimize/maximize completely
Additional Information:
This happens because Select2 adds some divs, that do not have ID property.
The following patch adds check for the needed attribute existance.
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 317abac238147cf20f09d2aa0b0dc069c12b0892)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 46506e215e42eaa854377337f8588436144ce1e3
Author: Emma <emma.nakamura.smith at gmail.com>
Date: Wed Jan 18 21:37:23 2017 +0000
Bug 17134: Replace item types codes with category in facets (opac)
To test:
-Search in OPAC for two or more items
-Note that item types display category codes rather than names
-Make change to file and test in OPAC
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 908163754010df8d78acf463d6777ba2c4c3a2e9)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 87edb0bdddab634598ae75db71748a446a6d37ed
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Nov 22 09:35:07 2016 +0000
Bug 16984: Do not clone the item block for standing orders
If AcqCreateItem is set to ordering and the basket is marked as
"standing orders", when ordering a JS error is raised:
additem.js:176 Uncaught TypeError: window[events[i]] is not a function
The item block should not be displayed in that case.
Test plan:
- Set AcqCreateItem to "ordering"
- Create a basket and tick the "Standing orders" checkbox
- Add an order to this basket
=> Without this patch you get the JS error
=> With this patch applied you will not get it
Signed-off-by: Claire Gravely <claire_gravely at hotmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit ba89de5837bbe3055a8b0a04517332d8aee68da7)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 5023593010d62cdcdb7191b7694de9ce58d5ff82
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Feb 8 17:49:41 2017 +0100
Bug 17940: (follow-up 14695) Fix - Mark holds as waiting when transfer is done
When an item from Library A is reserved and set to be picked up at
Library B, the hold buttons fail to confirm or cancel during check in at
Library B when the item is transferred from Library A.
Test plan:
* Create a hold for item at Library A to be picked up at Library B.
* Check in item at Library A to trigger the transfer.
=> item shows in transit
* Switch to Library B and check in item.
* Confirm the hold.
=> item shows waiting
Signed-off-by: Christopher Brannon <cbrannon at cdalibrary.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit ae2c1e6a83fab8b76606cc84a306b37d3b7403e4)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit dfe8fd300d114e6b45fdc47d107fd56d791dd898
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Feb 8 12:41:37 2017 +0100
Bug 18076: Replace holds_to_place_count with an input type=text
From http://www.template-toolkit.org/docs/manual/Directives.html#section_WHILE
"""
The Template Toolkit uses a failsafe counter to prevent runaway WHILE loops which
would otherwise never terminate. If the loop exceeds 1000 iterations then an undef
exception will be thrown, reporting the error:
WHILE loop terminated (> 1000 iterations)
The $Template::Directive::WHILE_MAX variable controls this behaviour and can be set
to a higher value if necessary.
"""
I do not think we want to increase this value, and I do not think we want to display a
dropdown list with 1000 entries.
This patch replaces the dropdown list with an input text.
Test plan:
- Set circulation conditions - holds per record = 999
- Search for record with items
- Go to the holds tab
- Search for a patron
- Verify that when you send your search, the 'internal server error' is not shown
and you see the input text.
You should be able to enter a value > than 999 and < 1
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit ac99f64010c6bdbe40abc2b823c2180b9b223425)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit e0b64c0f4ae29eae1a7c71d3d9e328683aa51317
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Sat Jan 21 08:48:20 2017 +0100
Bug 16115: Remove JS error on item search if NOT_LOAN values do not exist
If NOT_LOAN is not present, the item search form will raise a JS error:
SyntaxError: expected expression, got '}'
This patch fixes it by handling this specific case.
Note that the "Status" column is still displayed.
Test plan:
Remove your NOT_LOAN authorised values
Go on the item search form
=> You will not get the JS error and the "Status" bloc is no longer
displayed. There is no need to display it if empty.
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 27a4149625252e4c28dc97df998d82fd6f2652b8)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 2d363f136d8d9c4b35dfac455ea4f877fac7905d
Author: Luke Honiss <luke.honiss at gmail.com>
Date: Thu Jan 19 02:55:31 2017 +0000
Bug 11450: Hold Request Confirm Deletion
==TEST PLAN==
1) Go to an item with a hold and click on the holds tab on the
left
2) Click the red 'X'
3) The hold will be deleted immediately
4) Apply patch
5) Return to an item with a hold and click the 'X'
6) There will now be a confirmation dialog
7) Click cancel and the dialog will disappear and the hold will not be
deleted
8) Click OK and the hold will be deleted
Restored indentations - Mark Tompsett
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Christopher Brannon <cbrannon at cdalibrary.org>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 6ce97d9b06843fa65d6fb4a6d7c8cecd322bc8d6)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
-----------------------------------------------------------------------
Summary of changes:
C4/AuthoritiesMarc.pm | 101 ++++++++++++----
C4/Items.pm | 30 +++++
C4/XSLT.pm | 2 +-
Koha.pm | 2 +-
circ/returns.pl | 1 +
etc/zebradb/ccl.properties | 2 +-
.../marc21/biblios/biblio-koha-indexdefs.xml | 42 +++++++
.../marc21/biblios/biblio-zebra-indexdefs.xsl | 126 ++++++++++++++++++++
installer/data/mysql/updatedatabase.pl | 7 ++
.../prog/en/modules/acqui/neworderempty.tt | 2 +-
.../en/modules/admin/preferences/authorities.pref | 9 ++
.../prog/en/modules/catalogue/itemsearch.tt | 36 ++++--
.../prog/en/modules/reserve/request.tt | 18 ++-
.../prog/en/modules/tools/batchMod-edit.tt | 6 +-
koha-tmpl/intranet-tmpl/prog/js/cataloging.js | 1 +
misc/migration_tools/bulkmarcimport.pl | 2 +
opac/opac-search.pl | 2 +-
reports/borrowers_stats.pl | 2 +-
t/XSLT.t | 28 ++++-
t/db_dependent/Authorities/Merge.t | 107 +++++++++++------
t/db_dependent/Items.t | 52 +++++++-
t/db_dependent/Members/IssueSlip.t | 4 +-
virtualshelves/shelves.pl | 39 +++---
23 files changed, 505 insertions(+), 116 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list