[koha-commits] main Koha release repository branch master updated. v18.11.00-1154-gfc6b7e5
Git repo owner
gitmaster at git.koha-community.org
Tue Apr 16 15:40:04 CEST 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 fc6b7e5c3e101e0c5935f34c45b72cf3fd4f1bb7 (commit)
via 8e77287b9b2453fc29980d57154030c52cc62a07 (commit)
via a8e95a189f8842797395469680f686fba16fdca3 (commit)
via 8465b60a8e63ce53bf8225616fffe53b89e8c7b4 (commit)
via 37970eead1d265b6123f370afd87ac189d4e5e51 (commit)
via b74be6724b4b25c73b1e6f22d0ba270b50af755c (commit)
via 6d6aa48f6adbb8c60f44dde6c6bb8fbf9afdbf8b (commit)
via 2d7eba5be3f99d33533de4f32a88cca4de94b755 (commit)
via 44a39929afc60ddda3182a93197ced098044a12d (commit)
via 9df6a7d14f3dd869c00e514d7c3c45238aaaccc0 (commit)
via d4f133b0c03a0ef71ba689cea9abbea0a5149b80 (commit)
via 3a3ffbc54b8dec8ee63332417fe2732ee93f3034 (commit)
via 0be8fd212067ebd4b36e00b4d139761aa0e021c3 (commit)
via 003b70b697f9c57da8bfb0aca1223c867a07ac97 (commit)
via a131ffca088a8bf6a687cd57a7162c8511c88124 (commit)
via 6a58da7da2a3f72825d8b610961961a5f65f1af3 (commit)
via 34c835ed141a3b4758ad77e5b72f30e83d57024f (commit)
via 118f685dbf1519077ece65a47f83bff179efbf9b (commit)
via 1a2572915b4bf4a11b3a65c3a65e506610263a03 (commit)
via 545a3a1295b908ac79f8fd379374f5776d5b455d (commit)
via 3e7b24e023c7c88eb9b1a30308a537de9dcd8682 (commit)
via a48d1a43df24a47f1d31cd437a54961934d50230 (commit)
via ae18c4bb031a194302ced37f4b376c7439f77c99 (commit)
via 111068485d455d2020d68a69d29a562547e345c6 (commit)
via 2c461fc508d6161c3ab60b523bd724eef20870b9 (commit)
via f1c150c98fb60ea75eae7d3b55adbcb7620b7519 (commit)
via be3c2abbdc3410ea0cd7e9aa908329d9b46d8c14 (commit)
via 4d3461a671f8ad95917aab9ac193cd69fe6c1691 (commit)
via ba14e9ca7d40af664f7079c6a9f85a85e88fca9a (commit)
via 8cb24d65849aa881a0e6eb74271ca2d9c7ea455c (commit)
via d5d4501290704b9b3a0893a4a3df0a356abe445b (commit)
via 5ed171a45c46f63b18266ad3a3d0a978719ca285 (commit)
via 230905e1d56a11cf5619f95c95920eb09803900c (commit)
via 48787acc6f725686583bb05f45888acf3e1231d0 (commit)
from 7e218b81e6f7e4cf8bb8be3aef547cd1c1aac573 (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 fc6b7e5c3e101e0c5935f34c45b72cf3fd4f1bb7
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Tue Apr 16 13:14:17 2019 +0000
Bug 14457: DBRev 18.12.00.047
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 8e77287b9b2453fc29980d57154030c52cc62a07
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Wed Apr 3 21:20:40 2019 +0000
Bug 14457: (QA follow-up) Fix POD
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit a8e95a189f8842797395469680f686fba16fdca3
Author: Björn Nylén <bjorn.nylen at ub.lu.se>
Date: Wed Mar 13 12:28:55 2019 +0100
Bug 14457: (QA follow-up) Fix QA script complaints and amend system preference text
Pod coverage for 'NAME'.
Moved sysprefs in order and moved semicolon to last line.
Replaced tab indentation with spaces.
Added "Swedish service for spellchecking" to the syspref description.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 8465b60a8e63ce53bf8225616fffe53b89e8c7b4
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Thu Sep 29 21:47:52 2016 +0000
Bug 14457: (follow-up) Add syspref for Libris API URL
Added another syspref for the url of the Libris API
Added sysprefs to syspref.sql
Please test the 2 patches together
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 37970eead1d265b6123f370afd87ac189d4e5e51
Author: Eivin Giske Skaaren <eskaaren at yahoo.no>
Date: Mon Jul 6 21:46:49 2015 +0000
Bug 14457: Integrate LIBRIS spellchecking
This patch makes it possible to configure LIBRIS spellchecker as a
"did you mean" feature. When searching for a word or phrase and misspelling
the query will be sent to LIBRIS and if they have a suggestion it will
be shown in the yellow did you mean box in the results page.
The API is not very quick so this type of implementation was chosen to not
disrupt the real-time feeling of the search.
To test:
1. Apply the patch.
2. Go to http://api.libris.kb.se/bibspell/, enter the koha servers IP and click
on the "Generera nyckel" button.
3. Under "Nyckel" you can copy the value that looks like this: E47B44829E265607274B677BC17B8D78,
and enter it into the LibrisKey syspref (cgi-bin/koha/admin/preferences.pl?tab=searching).
4. In cgi-bin/koha/admin/didyoumean.pl check the box for using the LIBRIS API. It is only implemented for OPAC.
5. Perform some searches:
tset - Did you mean should suggest: test
jeg är på smester - suggestion: jag är på semester
dantes inferna - suggestion: dantes inferno
Restored opac-search.pl
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Seems to work, of course I can't tell if it is giving me accurate
suggestions :)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit b74be6724b4b25c73b1e6f22d0ba270b50af755c
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Thu Mar 28 08:53:46 2019 +0000
Bug 22588: (follow-up) Simplify getting accounts even more
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 6d6aa48f6adbb8c60f44dde6c6bb8fbf9afdbf8b
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Wed Mar 27 08:27:13 2019 +0000
Bug 22588: Simplify getting fines information in opac and selfcheckout
Test plan:
0) Have patron with some fines and credits
1) Go to opac and log in
2) Go to 'your summary' page and confirm it shows the right amount and
description for both, credit and debit
3) Go to 'your fines' page and confirm it show right information
4) Go to self checkout page and confirm the fines are right here
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 2d7eba5be3f99d33533de4f32a88cca4de94b755
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue Mar 26 16:34:34 2019 +0000
Bug 22698: Fix incorrect button classes
This patch builds on Bug 22023 in making further corrections to toolbar
button classes.
To test, apply the patch and view the following pages to confirm that
toolbar buttons are consistent:
- Acquisitions -> Vendor -> View basket.
- Administration -> Additional fields -> Select a table.
- Administration -> Audio alerts.
- Catalog -> Advanced search -> More/fewer options link
- Cataloging -> Edit record -> Advanced editor -> Advanced search.
- Cataloging -> Edit record -> Advanced editor -> Macros.
- Cataloging -> Edit record -> MARC21 008 value builder.
- Cataloging -> Search results.
- Circulation -> Checkout notes.
- Circulation: Sticky due date clear button, view restrictions, override
restrictions temporarily, add message, delete message
- Course reserves: Toolbar buttons on that page and the course reserve
detail page.
- ILL requests -> View ILL requests. The "New ILL request" and "List
requests" button.
- Lists and Lists -> View list.
- Patrons -> Search -> Merge patrons.
- Patrons -> View patron -> "Edit" button on patron image (patronimages
must be enabled).
- Patrons -> View patron -> "More" menu -> Manage API keys.
- Patrons -> View patron -> "More" menu -> Set permissions.
- Patrons -> View patron -> Delete circulation message link.
- Patrons -> View patron -> Edit patron.
- Patrons -> View patron -> Housebound.
- Reports -> Dictionary.
- Serials -> Numbering patterns.
- Serials -> Subscription -> Receive.
- Tools -> Labels -> Manage -> Label batches: Export selected.
- Tools -> Patron card creator -> Manage -> Card batches -> Edit batch.
- Tools -> Patron card creator. The "New" and "Manage" buttons.
- Tools -> Patron clubs.
- Tools -> Quote editor -> Import quotes.
- Tools -> Rotating collections. Toolbar buttons on that page and the
collection view page.
- Tools -> Tags.
- Tools -> Upload local cover image.
Signed-off-by: Michal Denar <black23 at gmail.com>
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 44a39929afc60ddda3182a93197ced098044a12d
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Thu Apr 4 01:36:47 2019 +0000
Bug 22154: Fix search for Braille from Advanced search page
When you do an advanced search and choose the Format subtype
Braille, it looks for l-format:fk, but that is not the right
code for Braille.
fk does not exist. It should be fb for Tactile material/Braille
OR tc for Text/Braille
To test:
0) Catalog 2 records, one with 007 tc and another with fb
Use value builder to verify both are for Braille.
1) In Administration > System preferences, make sure 'Subtypes'
is checked in either OpacAdvSearchMoreOptions or OpacAdvSearchOptions
2) Go to Advanced search
3) If necessary, click on 'More options'
4) In the 'Subtype limits' section, choose 'Braille' from the 'Format'
drop-down menu
5) Click on 'Search'
6) Verify both records were found
Signed-off-by: Michal Denar <black23 at gmail.com>
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 9df6a7d14f3dd869c00e514d7c3c45238aaaccc0
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Fri Apr 12 11:51:52 2019 +0200
Bug 21975: (follow-up) avoid undef in eq
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit d4f133b0c03a0ef71ba689cea9abbea0a5149b80
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Fri Apr 12 11:42:39 2019 +0200
Bug 21975: (follow-up) get item datas from previous SQL query
Forced by removal of C4::Items::GetItem from Bug 21206
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 3a3ffbc54b8dec8ee63332417fe2732ee93f3034
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Fri Dec 7 16:05:52 2018 +0100
Bug 21975: Avoid unnecessary substitutions in automatic item modification by age
Automatic item modification by age cronjob is based on rules with conditions and substitutions.
When substitution value is equal to actual item value, the code should not call C4::Items::ModItem. It adds unnecessary action log and entry in zebraqueue.
With a rule than can impact all catalogue you can explode your database with action logs.
Test plan :
1) Run prove t/db_dependent/Items/AutomaticItemModificationByAge.t
2) Define a item modification by age with no condition
3) Run several times misc/cronjobs/automatic_item_modification_by_age.pl
4) Check it creates only one entry in action_logs and zebraqueue
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 0be8fd212067ebd4b36e00b4d139761aa0e021c3
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Fri Dec 7 15:21:48 2018 +0100
Bug 21975: add Unit Test
Added missing transaction rollback
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 003b70b697f9c57da8bfb0aca1223c867a07ac97
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Fri Dec 7 15:58:54 2018 +0100
Bug 21975: get item field in substitutions
substitutions field stores the item field with 'items.' prefix.
Looks like call of C4::Items::ModItem() works but it will not if ORM object is used in the futur.
So I prefer fix it now and it is needed for main patch.
Test plan :
Run t/db_dependent/Items/AutomaticItemModificationByAge.t
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit a131ffca088a8bf6a687cd57a7162c8511c88124
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Tue Apr 16 12:12:11 2019 +0000
Bug 22695: DBRev 18.12.00.046
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 6a58da7da2a3f72825d8b610961961a5f65f1af3
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Apr 12 12:52:52 2019 +0000
Bug 22695: Remove non-XSLT search results view from the staff client
This patch removes the option to select non-XSLT search results in the
staff client. The patch removes the markup from the template, updates
the system preference options, and modifies Search.pm so that OPAC and
staff client results XSLT functions are not tied together.
To test, apply the patch and set the XSLTResultsDisplay to a blank
value. Run the database update. The value of the XSLTResultsDisplay
system preference should now be "default."
Perform a catalog search in the staff client. The results should be
shown using the XSLT view.
Test that OPAC search results respect the OPACXSLTResultsDisplay
preference when enabled and disabled.
Signed-off-by: Pierre-Marc Thibault <pierre-marc.thibault at inLibro.com>
Signed-off-by: Bin Wen <bin.wen at inlibro.com>
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 34c835ed141a3b4758ad77e5b72f30e83d57024f
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Apr 12 11:04:06 2019 +0000
Bug 18011: Enrollment period date on patron category can be set in the past without any error/warning messages
This patch modifies the patron category edit form so that the enrollment
period datepicker widget cannot be used to select a date in the past.
The <input> element had a "datepicker" class, which triggers a default
datepicker configuration. This was overriding the configuration in the
page-specific JavaScript file.
To test, apply the patch and go to Administration -> Patron categories.
Click the "Enrollment period -> Until date" field and verify that dates
before today are disabled.
Signed-off-by: Pierre-Marc Thibault <pierre-marc.thibault at inLibro.com>
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 118f685dbf1519077ece65a47f83bff179efbf9b
Author: Ere Maijala <ere.maijala at helsinki.fi>
Date: Thu Mar 7 16:35:30 2019 +0200
Bug 22474: Clone field config before adding fields to it
Test plain:
1. Reindex both authorities and biblios with the -d flag to recreate the index, e.g. "perl misc/search_tools/rebuild_elastic_search.pl -v -d"
2. Check that authorities only contains authority-specific fields in Elasticsearch e.g. by fetching http://localhost:9200/koha_dev_authorities/_mappings
3. Reindex both without the -d flag and verify it works, e.g. "perl misc/search_tools/rebuild_elastic_search.pl -v"
Signed-off-by: Björn Nylén <bjorn.nylen at ub.lu.se>
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 1a2572915b4bf4a11b3a65c3a65e506610263a03
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Sun Apr 7 18:23:32 2019 +0000
Bug 22090: Add missing information to cash register CSV file
Some information was missing from the CSV export file
of the Cash register report: manager surname, patron surname
and payment notes.
Also pretties up the column headers a bit and makes the
sequence between GUI and CSV export match.
To test:
- Make sure you have some fines and fees and payments in
your system
- Make a search with the Cash register report
- Export results as CSV
- Proof read hader line and make sure contents match headings
- Verify first name and surname are shown for manager and patron
- Verify notes show up
Signed-off-by: Michal Denar <black23 at gmail.com>
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 545a3a1295b908ac79f8fd379374f5776d5b455d
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Tue Apr 16 11:52:46 2019 +0000
Bug 22069: (follow-up) fix patorns type for patrons
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 3e7b24e023c7c88eb9b1a30308a537de9dcd8682
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Sun Apr 7 17:51:13 2019 +0000
Bug 22069: Make log viewer find item renewals
Without this patch renewals for checkouts wouldn't
show in the log viewer. The log viewre was using
RENEW, which we use for patrons, but for issue
RENEWAL is used.
The patch adds RENEWAL to the search params, when
Renew was selected in the form, so both terms are
included in the query.
To test:
- Make sure you have RenewalLog turned on
- Make a patron renewal
- Check something out and renew it
- Go to Tools > Log viewer and test different
searches
- Modules All - Actions All
- Modules All - Actions Renew
- Modules Circulation - Actions Renew
...
- Make sure results show as expected
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit a48d1a43df24a47f1d31cd437a54961934d50230
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Thu Apr 11 17:15:51 2019 -0300
Bug 22688: (QA follow-up) Use search_params as all() does
It looks like selected would be passed all the way down to
Koha::Libraries->search and this would fail all the time.
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit ae18c4bb031a194302ced37f4b376c7439f77c99
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Thu Apr 11 09:52:29 2019 -0400
Bug 22688: TT plugin for pickup locations code wrong
Test Plan:
1) Apply this patch
2) prove t/db_dependent/Koha/Libraries.t
Signed-off-by: Agustín Moyano <agustinmoyano at theke.io>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 111068485d455d2020d68a69d29a562547e345c6
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Thu Apr 11 17:14:05 2019 -0300
Bug 22688: (follow-up) Unit tests
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 2c461fc508d6161c3ab60b523bd724eef20870b9
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Thu Apr 11 10:13:58 2019 -0400
Bug 22688: Unit tests
Signed-off-by: Agustín Moyano <agustinmoyano at theke.io>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit f1c150c98fb60ea75eae7d3b55adbcb7620b7519
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Tue Feb 26 13:54:28 2019 +0000
Bug 22451: Use Asset everywhere
Test plan:
Use installer and onboaarding tool, make sure the js and css files are
loaded
Signed-off-by: Hayley Mapley <hayleymapley at catalyst.net.nz>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit be3c2abbdc3410ea0cd7e9aa908329d9b46d8c14
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Tue Feb 26 13:43:21 2019 +0000
Bug 22451: Update test
Test plan:
prove t/db_dependent/Koha/Template/Plugin/Asset.t
Signed-off-by: Hayley Mapley <hayleymapley at catalyst.net.nz>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 4d3461a671f8ad95917aab9ac193cd69fe6c1691
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Tue Feb 26 13:30:20 2019 +0000
Bug 22451: Make Asset plugin use Koha::version instead of version from db
Test plan:
Apply the patch a try to use Koha, css and js files should be used
normally
Signed-off-by: Hayley Mapley <hayleymapley at catalyst.net.nz>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit ba14e9ca7d40af664f7079c6a9f85a85e88fca9a
Author: Lyon3 Team <koha at univ-lyon3.fr>
Date: Thu Apr 11 10:48:42 2019 +0200
Bug 22652: Editing Course reserves is broken
To test:
1. Create a course reserve or go on an existing one
2. Add items and add a change for the holdingbranch
3. On the list of items in this course reserve
(course_reserves/course-details.pl?course_id=xx), click on "edit" at the
end of a row :
Without the patch, you can't see the holdingbranch you have choose for
this item, but you see "LEAVE UNCHANGED"
With the patch, you can see the holdingbranch you have choose when
adding this item in the course
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Mikaël Olangcay Brisebois <mikael.olangcay-brisebois at inLibro.com>
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 8cb24d65849aa881a0e6eb74271ca2d9c7ea455c
Author: Olivier Crouzet <kohateam at univ-lyon3.fr>
Date: Mon Mar 11 15:00:23 2019 +0100
Bug 20830: Make sure a fund is selected when ordering from a stage file
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit d5d4501290704b9b3a0893a4a3df0a356abe445b
Author: Christopher Brannon <cbrannon at cdalibrary.org>
Date: Wed Dec 5 20:33:25 2018 +0000
Bug 21346: Remove inline onclicks per comment 42
To test:
1) Apply patch.
2) Check that there is no changed behavior with buttons or checkboxes.
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 5ed171a45c46f63b18266ad3a3d0a978719ca285
Author: Christopher Brannon <cbrannon at cdalibrary.org>
Date: Sun Nov 4 03:47:30 2018 +0000
Bug 21346: Convert dialogs to modals.
This addresses most of the transfer dialogs. There are some dialogs
that I have not converted because I don't know what triggers them,
therefore I cannot test them.
The following scenarios have been addresses, and should be tested:
FOR TRANSFERS
1) Checkin with no issue, hold or transfer; not at home (AutomaticItemReturn set to Don't)
* Should give 3 options - Yes, Yes with print, or No.
* Yes and Yes with print should trigger a transfer back home.
* No should do nothing.
* Print should open a window for printing, with correct
information.
* All three options should close the modal.
TO TEST:
1) Set AutomaticItemREturn to Don't.
2) Check in an item with no issues, holds or transfers set, at a
location other than the owning library.
3) Test conditions above.
2) Checkin with no issue, hold or transfer; not at home (AutomaticItemReturn set to Do)
* Should give 2 options - Print or OK.
* Should automatically set transfer.
* Print should open a window for printing, with correct information.
* Both buttons should close modal.
TO TEST:
1) Set AutomaticItemReturn to Do.
2) Check in an item with no issues, holds or transfers set, at a
location other than the owning library.
3) Test conditions above.
3) Checkin with no issues or holds, but transfer already set
* Should give 3 options - OK, Print or Cancel.
* OK and print should not touch existing transfer.
* Cancel should remove the exisiting transfer.
* Print should open a window for printing, with correct information.
* All three options should close the modal.
TO TEST:
1) Check in an item following step 2 of either test above.
2) Check in item again, while a transfer exists.
3) Test conditions above.
WRONG BRANCH
4) If AllowReturnToBranch is not set "to any library", and the item is not checked in at the appropriate branch, the wrong-branch-modal pops up:
* Should give 1 option - OK.
* Should not check anything in or initiate a transfer.
* OK should close the modal.
TO TEST:
1) Set AllowReturnToBranch to "only the library the item is from".
You can test the other settings, as long as you pay attention to
where you are checking the item in at.
2) Check in an item at a branch other than the owning library.
3) Test conditions above.
Signed-off-by: Lisette <lisetteslatah at gmail.com>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 230905e1d56a11cf5619f95c95920eb09803900c
Author: Christopher Brannon <cbrannon at cdalibrary.org>
Date: Thu Nov 1 21:08:19 2018 +0000
Bug 21346: Remove double dialog
To Test:
1) Place a hold on an item for pickup at another branch.
2) Check in item to trigger hold and transfer.
3) Check in item again without changing location. Note modal AND old
dialog behind modal.
4) Apply patch.
5) Check in item again without changing location. Note modal without
the old dialog.
Signed-off-by: Lisette <lisetteslatah at gmail.com>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 48787acc6f725686583bb05f45888acf3e1231d0
Author: Christopher Brannon <cbrannon at cdalibrary.org>
Date: Thu Nov 1 20:21:08 2018 +0000
Bug 21346: Streamline logic in holds and transfers
1) Replaced comparison with string to make testing branch easier.
2) Replaced useless 0 values with undef.
Does not change any behavior, only simplifies code.
Signed-off-by: Lisette <lisetteslatah at gmail.com>
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Installer/PerlDependencies.pm | 2 +-
C4/Items.pm | 8 +-
C4/Search.pm | 12 +-
Koha.pm | 2 +-
Koha/SearchEngine/Elasticsearch.pm | 21 +-
Koha/SuggestionEngine/Plugin/LibrisSpellcheck.pm | 100 +++++++++
Koha/Template/Plugin/Asset.pm | 4 +-
Koha/Template/Plugin/Branches.pm | 9 +-
circ/returns.pl | 10 +-
installer/data/mysql/sysprefs.sql | 2 +
installer/data/mysql/updatedatabase.pl | 19 ++
.../intranet-tmpl/prog/en/includes/circ-menu.inc | 4 +-
.../csv_headers/reports/cash_register_stats.tt | 2 +-
.../intranet-tmpl/prog/en/includes/ill-toolbar.inc | 8 +-
.../prog/en/includes/installer-doc-head-close.inc | 8 +-
.../prog/en/includes/installer-intranet-bottom.inc | 11 +-
.../prog/en/includes/patroncards-toolbar.inc | 4 +-
.../prog/en/includes/quotes-upload-toolbar.inc | 6 +-
.../en/includes/rotating-collections-toolbar.inc | 8 +-
.../intranet-tmpl/prog/en/includes/select2.inc | 2 +-
.../prog/en/includes/virtualshelves-toolbar.inc | 4 +-
.../prog/en/modules/acqui/addorderiso2709.tt | 14 ++
.../intranet-tmpl/prog/en/modules/acqui/basket.tt | 4 +-
.../prog/en/modules/admin/additional-fields.tt | 2 +-
.../prog/en/modules/admin/audio_alerts.tt | 2 +-
.../prog/en/modules/admin/categories.tt | 2 +-
.../prog/en/modules/admin/didyoumean.tt | 2 +
.../en/modules/admin/preferences/searching.pref | 10 +
.../en/modules/admin/preferences/staff_client.pref | 4 +-
.../prog/en/modules/catalogue/advsearch.tt | 8 +-
.../prog/en/modules/catalogue/results.tt | 39 ----
.../prog/en/modules/cataloguing/addbooks.tt | 2 +-
.../prog/en/modules/cataloguing/editor.tt | 8 +-
.../cataloguing/value_builder/marc21_field_008.tt | 4 +-
.../prog/en/modules/circ/checkout-notes.tt | 4 +-
.../prog/en/modules/circ/circulation.tt | 10 +-
.../intranet-tmpl/prog/en/modules/circ/returns.tt | 213 +++++++++++++-------
.../intranet-tmpl/prog/en/modules/clubs/clubs.tt | 6 +-
.../en/modules/course_reserves/add_items-step2.tt | 2 +-
.../en/modules/course_reserves/course-details.tt | 8 +-
.../en/modules/course_reserves/course-reserves.tt | 2 +-
.../prog/en/modules/ill/ill-requests.tt | 16 +-
.../prog/en/modules/labels/label-manage.tt | 2 +-
.../prog/en/modules/members/apikeys.tt | 2 +-
.../prog/en/modules/members/housebound.tt | 4 +-
.../prog/en/modules/members/member-flags.tt | 4 +-
.../prog/en/modules/members/memberentrygen.tt | 2 +-
.../prog/en/modules/members/merge-patrons.tt | 2 +-
.../prog/en/modules/members/moremember.tt | 4 +-
.../prog/en/modules/onboarding/onboardingstep3.tt | 4 +-
.../prog/en/modules/patroncards/edit-batch.tt | 14 +-
.../prog/en/modules/reports/cash_register_stats.tt | 2 +-
.../prog/en/modules/reports/dictionary.tt | 2 +-
.../prog/en/modules/serials/serials-edit.tt | 4 +-
.../modules/serials/subscription-numberpatterns.tt | 6 +-
.../intranet-tmpl/prog/en/modules/tags/review.tt | 4 +-
.../prog/en/modules/tools/upload-images.tt | 2 +-
.../intranet-tmpl/prog/en/modules/tools/viewlog.tt | 1 +
.../bootstrap/en/includes/account-table.inc | 8 +-
.../bootstrap/en/modules/opac-advsearch.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/opac-reserve.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/opac-user.tt | 25 +--
opac/opac-account.pl | 27 +--
opac/opac-user.pl | 11 -
opac/sco/sco-main.pl | 29 +--
reports/cash_register_stats.pl | 6 +-
.../Items/AutomaticItemModificationByAge.t | 12 +-
t/db_dependent/Koha/Template/Plugin/Asset.t | 7 +-
t/db_dependent/Template/Plugin/Branches.t | 185 +++++++++++------
tools/viewlog.pl | 3 +
70 files changed, 591 insertions(+), 393 deletions(-)
create mode 100644 Koha/SuggestionEngine/Plugin/LibrisSpellcheck.pm
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list