Josef Moravec [Thu, 18 Apr 2019 07:21:09 +0000 (07:21 +0000)]
Bug 16284: Use new method to determine serials in check previous checkouts
Signed-off-by: Michal Denar <black23@gmail.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Josef Moravec [Thu, 18 Apr 2019 07:19:34 +0000 (07:19 +0000)]
Bug 16284: Add Koha::Biblio->is_serial method
Test plan:
prove t/db_dependent/Koha/Biblio.t
Should return green
Signed-off-by: Michal Denar <black23@gmail.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Josef Moravec [Tue, 16 Apr 2019 10:59:43 +0000 (10:59 +0000)]
Bug 16284: Add test
Signed-off-by: Michal Denar <black23@gmail.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Josef Moravec [Thu, 22 Jun 2017 09:26:53 +0000 (11:26 +0200)]
Bug 16284: Check only item for previous checkout if biblio is serial
Test plan:
1) Set 'CheckPrevCheckout' system preference to 'Do'
2) Make a checkout with item from serial record (942$s is 1 on default
settings)
3) Return that checkout
4) Try to check it out again, you should see an alert, that the patron
has thi item checked out previously
5) Try to checkout another item from same bibliographic record, you
sholud not see the alert and item should be checked out
6) prove t/db_dependent/Patron/Borrower_PrevCheckout.t
Signed-off-by: Michal Denar <black23@gmail.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Marcel de Rooy [Fri, 9 Aug 2019 10:17:41 +0000 (10:17 +0000)]
Bug 16219: (QA follow-up) Tiny regex change
The parameter <<>> does not work. There should be text inside.
The construction .*? does not look good completely.
Replacing it by the stricter [^>]+ So, no greater than's and at least one.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Nick Clemens [Wed, 5 Sep 2018 11:15:01 +0000 (11:15 +0000)]
Bug 16219: Add 'params' parameter to runreport.pl
To test:
1 - Apply patch
2 - Write a report that takes no variables
3 - Run this using runreport.pl
perl misc/cronjobs/runreport.pl 1
4 - Confirm results as expected
5 - Write a report that takes one or more variables
6 - Run using runreport.pl, but pass no params
7 - You should get a SQL error
8 - Now run passing the correct number of params
perl misc/cronjobs/runreport.pl --param first --param=2nd 2
9 - Verify results as expected
10 - call runreport with no parameters
perl misc/cronjobs/runreport.pl
11 - Verify documentation is correct and helpful
Signed-off-by: Claire Gravely <claire.gravely@bsz-bw.de> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Bug 22272: Calendar: When entering date ranges grey out dates in the past from the start date
In "Calendar" tool it's possible to pick dates before start
date as end date.
This patch sets end date calendars "minDate" as picked start day
to grey out past dates. Also reindents datepicker code for
better readability.
Test plan:
- Apply this patch
- Set start date from first calendar
- Set end date from second calendar
=> Dates before start date are greyed out
Signed-off-by: Nadine Pierre <nadine.pierre@inLibro.com> Signed-off-by: Lucas Gass <lucas@bywatersolutions.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Alex Buckley [Tue, 9 Jul 2019 13:51:31 +0000 (13:51 +0000)]
Bug 13552: (follow-up) Add debar option to batch patron modification
As per test feedback I've changed wording from debarrment to restriction
Added insertion into the borrower_debarments table and removal from
borrower_debarments table (and borrowers.debarred and
borrowers.debarredcomment) when either 'Restriction
expiration' or 'Restriction comment' are ticket to be disabled/deleted.
Test plan (please follow this instead of following test plan in the
first patch):
1. Go to Tools > Batch patron modification
2. Input the cardnumbers of several (undebarred/unrestricted) patrons
and submit
3. Notice there is no input for setting Restriction expiration date or
Restriction comment
Also notice in the list of matching borrowers at the top of the page
there is no display of the 'Restriction expiration' or 'Restriction
comment' values for the patron
4. Apply patch
5. Restart memcached and plack
6. Refresh the page notice 'Restriction expiration' (a date picker
input) and 'Restriction comment'are now input options
Also notice in the table at the top of the page 'Restriction
expiration' and 'Restriction comment' are shown on the far right of the table (you may need
to scroll to see this)
7. Pick a date in the 'Restriction expired' datepicker and write in text into
the 'Restriction comment' field and submit
8. Notice in the next loaded page the selected patrons have the
'Restriction expiration' and 'Restriction comment' values you entered
9. Query the borrower_debarments database table and check that the new
debarments are added to this table
10. Go back to the Batch patron modification page and re-input the same
cardnumbers
11. Write text into the 'Restriction comment' field and don't pick a
'Restriction expiration' value and submit
12. Notice in the next loaded page the selected patrons have the
'Restriction expiration' value of 9999-12-31 and 'Restriction comment'
value you just entered
13. Query the borrowers table and notice the borrowers.debarred value
for the modified patrons is '9999-12-31' and the
borrower.debarredcomment is what you inputted in step 11
14. Query the borrower_debarments table and notice the expiration value
is NULL and the comment value is set to what you entered in step 11
Also note the addition of the new debarment has not removed the existing
debarment on the patrons
15. Click on the cardnumber link of one of the patrons and notice the red
text on their patron account page informing you they are restricted
until the date you set
16. In the Koha home directory enter Koha shell:
sudo koha-shell <instancename>
17. Run: prove xt
18. All tests should pass
19. Repeat step 10 and tick the checkbox beside the 'Restriction
expiration' field and submit
20. In the next loaded screen notice the 'Restricted expiration'and
'Restricted comment' are empty
Check the borrower_debarments table and notice all restrictions for the
patron are removed.
Check the borrowers table and notice the debarred and debarredcomment
fields are empty for the patrons
21. Repeat steps 10 and 11 to make a new restriction
22. Repeat step 19 and this time check the 'Restriction comment' field
and submit and observe that also clears the restriction in the next
loaded page, in the borrower_debarments and borrowers table
23. Sign off
Sponsored-By: Brimbank Library, Australia Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Alex Buckley [Tue, 9 Jul 2019 06:02:01 +0000 (06:02 +0000)]
Bug 13552: Add debar option to batch patron modification
Test plan:
1. Go to Tools > Batch patron modification
2. Input the cardnumbers of several (undebarred/unrestricted) patrons and submit
3. Notice there is no input for setting a debarred until (restriction
expiration) date or debar comment
Also notice in the list of matching borrowers at the top of the page
there is no display of the debarred or debarredcomment values for the
patron
4. Apply patch
5. Restart memcached and plack
6. Refresh the page notice 'Debarred till' (a date picker input) and
'Debarred comment' are now input options
Also notice in the table at the top of the page 'Debarred till' and
'Debarred comment' are shown on the far right of the table (you may need
to scroll to see this)
7. Pick a date in the 'Debarred till' datepicker and write in text into
the 'Debarred comment' field and submit
8. Notice in the next loaded page the selected patrons have the
'Debarred till' and 'Debarred comment' values you entered
9. Click on the cardnumber link of one of the patrons and notice the red
text on their patron account page informing you they are restricted
until the date you set
10. In the Koha home directory enter Koha shell:
sudo koha-shell <instancename>
11. Run: prove xt
12. Confirm all tests pass
13. Sign off
Sponsored-By: Brimbank Library, Australia Signed-off-by: Josef Moravec <josef.moravec@gmail.com> Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Kyle M Hall [Mon, 25 Mar 2019 12:20:51 +0000 (08:20 -0400)]
Bug 20954: (QA follow-up) Rename syspref-overrides to syspref_overrides to maintain existing convention
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Kyle M Hall [Fri, 15 Jun 2018 13:03:43 +0000 (13:03 +0000)]
Bug 20954: Add ability to set syspref overrides in SIP as we can in apache
We should be able to set system preference overrides for SIP in a
similar manner that we do in Apache. It would be great if we could
specify those overrides on both a config level, and login level basis.
Test Plan:
1) Apply this patch
2) Start your SIP server
3) Enable the syspref AllFinesNeedOverride
4) Find or create a patron with a small fine ( less than noissuescharge )
5) Attempt to check out an item to the patron, it should fail
6) Add the global syspref override from the bottom of the example SIP config file
7) Restart your SIP server
8) Attempt to check out an item to the patron again, this time it should work
9) Now, add the login level syspref override section as it appears in
the eaxmple SIP config file. Make sure to add it to the login you are using
10) Attempt to check out another item to the patron, this time is should
again fail
Signed-off-by: Liz Rea <wizzyrea@gmail.com> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Nick Clemens [Wed, 31 Jul 2019 11:43:11 +0000 (11:43 +0000)]
Bug 23390: (follow-up) Quote aliases
Signed-off-by: George Williams <george@nekls.org> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: George Williams <george@nekls.org> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Nick Clemens [Sat, 27 Jul 2019 13:07:18 +0000 (13:07 +0000)]
Bug 23390: Introduce placeholder syntax for report column names
This patch adds the ability to rename columns in MySQL reports using a syntax:
[[column|alias]]
To test:
1 - Write a report like:
SELECT cardnumber FROM borrowers WHERE cardnumber LIKE '%9'
2 - Run report
3 - Note you can batch modify the patrons
4 - Update report:
SELECT cardnumber AS library_barcode FROM borrowers WHERE cardnumber LIKE '%9'
5 - Run report
6 - Note batch options are no longer present
7 - Apply patch
8 - Run report, no change
9 - Update report like:
SELECT [[cardnumber|library_barcode]] FROM borrowers WHERE cardnumber LIKE '%9'
10 - Run report
11 - Batch options work!
12 - Update report like:
SELECT cardnumber FROM borrowers WHERE cardnumber LIKE '%9'
13 - Verify batch options still work
14 - Set report 'public'
15 - Verify report can be run via JSON URLs:
http://kohadev.mydnsname.org:8080/cgi-bin/koha/svc/report?id=1
http://kohadev.mydnsname.org:8081/cgi-bin/koha/svc/report?id=1
Signed-off-by: George Williams <george@nekls.org> Signed-off-by: George Williams <george@nekls.org> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Owen Leonard [Mon, 29 Jul 2019 12:57:21 +0000 (12:57 +0000)]
Bug 23385: (follow-up) Update link
This follow-up adds a dummy href attribute to the link for showing and
hiding the default values form so that it behaves more like a link.
I removed "click to" from the link text and added Font Awesome icons
common to "show/hide" links.
Signed-off-by: George Williams <george@nekls.org> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Nick Clemens [Fri, 26 Jul 2019 14:48:51 +0000 (14:48 +0000)]
Bug 23385: Hide 'Default values' fields by default
To test:
1 - Go to Tools->Import patrons
2 - Choose a file
3 - Scroll a long way to submit
4 - Apply patch
5 - Choose a file
6 - Can submit easily
7 - Click to expand and enter default fields
8 - Confirm can still submit and that values entered are used
Signed-off-by: Maryse Simard <maryse.simard@inlibro.com> Signed-off-by: George Williams <george@nekls.org> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Fridolin Somers [Wed, 7 Aug 2019 13:33:52 +0000 (15:33 +0200)]
Bug 23438: Use Font Awesome icons in intranet search results browser
In intranet after a search you see a results browser top left of biblio record details.
Actually this uses text for links next and previous with a character for the arrows.
I propose to use Font Awesome icons arrows.
In fact the translated text is often too large for those buttons.
For example "Previous" is "Préédant" in french and it causes the next and previous buttons to display on two lines.
Using icons is more compact and easy to use.
This patch also adds the list icon to back to results link and changes for a minimal text "Results".
1) Go to intranet
2) Perform a search with a few results
3) Click on first record
4) Check browser displays well
5) Click on next icon, check you go to next search result
6) Click on revious icon, check you go to previous search result
7) Click on "Results", you come back to search results
8) Clik on "Last" and click on last record
9) Check browser displays well
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Nick Clemens [Thu, 1 Aug 2019 11:44:39 +0000 (11:44 +0000)]
Bug 23408: Move relatives-issues-table to an include
TO test:
1 - Find and adult patron
2 - Add a child account
3 - Check out some things to the child
4 - View the adults account, click 'Relatives checkouts'
5 - Observe table is oddly formatted
6 - View on both the 'Check out' and 'Details' tabs
7 - Apply patch
8 - Tables are displayed correctly
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Nick Clemens [Mon, 15 Jul 2019 17:46:36 +0000 (17:46 +0000)]
Bug 23319: Implement blocking errors for neworderbiblio and basket.pl
To test:
1 - Hit neworderbiblio with a query and no vendor
http://localhost:8081/cgi-bin/koha/acqui/neworderbiblio.pl?q=cat
Or, add to basket from existing record with a search
Refresh the page (url has no parameters)
2 - Get an internal server error
3 - Add bookseller
http://localhost:8081/cgi-bin/koha/acqui/neworderbiblio.pl?q=cat&booksellerid=1
4 - Click 'Order' on a result
5 - Internal server error
6 - Apply patch
7 - Repeat 1-4, you get 'Vendor not found' or 'Basket not found'
Signed-off-by: Maryse Simard <maryse.simard@inlibro.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Owen Leonard [Fri, 9 Aug 2019 11:43:42 +0000 (11:43 +0000)]
Bug 23441: Export should not include the 'actions' column in Z3950 results.
This patch adds the "noExport" class to the table header for the Z39.50
search results "Actions" column. This class prevents the column from
being included in DataTables export operations.
To test, apply the patch and perform a Z39.50 search from Cataloging. On
the search results page, click the "Export or print" button. Choose one
of the export options and verify that in the resulting data there is no
"Actions" column.
Signed-off-by: Maryse Simard <maryse.simard@inlibro.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Alex Arnaud [Wed, 7 Aug 2019 08:57:01 +0000 (10:57 +0200)]
Bug 23436: add a label for duplicate backend
Reproduce issue:
- Enable "EnableAdvancedCatalogingEditor" preference
- Go to cataloguing and click on advanced editor
- Click on the down arrow in "Save to catalog" menu
- You should see an undefined named save backend
Test patch:
- Enable "EnableAdvancedCatalogingEditor" preference
- Go to cataloguing and click on advanced editor to save preference to
the cookie
- Click on the down arrow in "Save to catalog" menu
- You should see a "Duplicate" named backend
Test Bug 16232 for no regression:
- Search for a biblio in catalog
- Click in "Edit record"
- Advanced editor should appear.
SUCCESS => browser url ends with #duplicate/{original biblionumber}
=> Title above toolbar is "Editing duplicate record of
#{original biblionumber}"
- Save
SUCCESS => browser url ends with #catalog/{new biblionumber}
=> Title above toolbar is "Editing catalog record #{new
biblionumber}"
More test:
- Search for a biblio in catalog
- Click on "Edit record"
- Advanced editor should appear
- Click on the down arrow in "Save to catalog" menu and click on
Duplicate,
- Record should be saved as a new one (same behavior)
Signed-off-by: cori <corilynn.arnold@gmail.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Jonathan Druart [Mon, 5 Aug 2019 15:54:57 +0000 (10:54 -0500)]
Bug 22142: Do not revert data if 'unchanged' was set
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Nick Clemens [Thu, 13 Jun 2019 14:20:25 +0000 (14:20 +0000)]
Bug 22142: Highlight the issue
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Nick Clemens [Fri, 2 Aug 2019 13:22:37 +0000 (13:22 +0000)]
Bug 23416: Add PreserveSerialNotes system preference
Bug 11492 intended to pass routinglists forward. It also passed forward serial notes.
This may or not me desired behvaiour, to avoid changing functionality twice I add a syspref
to control this behaviour.
To test:
1 - Have or create a subscription in the serials module
2 - Recieve an issue, making sure ot ad a note
3 - Go to receive again, note the note from the last serial is set for the expected issue
4 - Apply patch
5 - Update database, restart all the things
6 - Receive the issue leaving the note in place
7 - Note the next expected issue has the note
8 - Find the syspref PreserveSerialNotes
9 - Confirm it defaulted to Do
10 - Set it to 'Do not'
11 - Receive the expected serial leavign the note
12 - Note the newly generated expected serial has no note
13 - prove -v t/db_dependent/Serials.t
Signed-off-by: Nadine Pierre <nadine.pierre@inLibro.com> Signed-off-by: Maryse Simard <maryse.simard@inlibro.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Owen Leonard [Tue, 6 Aug 2019 13:25:24 +0000 (13:25 +0000)]
Bug 23434: Hold confirmation dialog problem if HoldsAutoFill is enabled
This patch corrects a problem with hold confirmation dialogs on the
checkin page when the HoldsAutoFill system preference is enabled and the
item being checked in has a hold at another library.
The confirmation dialog is converted to a modal to match other
confirmation information.
As part of this process two whole sections of the template have been
removed because they were redundant.
To test, apply the patch and test the following circumstances both with
HoldsAutoFill enabled AND disabled:
- A hold for a patron at your library
- A hold for a patron not at your library
- With HoldsAutoFill ON, both the "OK" and "Print slip and confirm"
buttons should dismiss the modal without reloading the page.
- A hold which is already marked 'Waiting'
- An item which needs to be transferred
- An item which has already been transferred
In all cases the confirmation modal should appear with correct
information.
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Martin Renvoize [Mon, 12 Aug 2019 13:29:58 +0000 (14:29 +0100)]
Bug 23307: (RM follow-up) Fix breaking change to columns_settings.inc
The changes to columns_settings.inc in bug 23307 inadvertantly change
the return from an updated jQuery datatable object to a plain jQuery
object and as such broke a number of tables in Koha. This patch simply
reverts the change whilst continuing to allow the new functionality to
work as expeced.
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Owen Leonard [Fri, 12 Jul 2019 14:13:50 +0000 (14:13 +0000)]
Bug 23307: Add columns configuration to cataloguing/z3950_search.tt
This patch adds columns configuration to the DataTable which displays
Z39.50 search results in the cataloging module.
The Z39.50 results screen has its own server-side paging system, so I
added some code to copy the page number information ("Page 2 / 6") to
the DataTable toolbar for a more consistent appearance. The wording of
that information has also been modified for consistency's sake.
To test, apply the patch and restart Plack (or restart_all on
kohadevbox)
- Go to Cataloging -> New from Z39.50/SRU.
- Perform a Z39.50 search which will return multiple pages of results.
- Confirm that the DataTable controls work correctly: Search, columns
show/hide, export.
- Confirm that the page number information is correct as you navigate
through pages of results.
- Go to Administration -> Columns settings.
- Confirm that the columns configuration settings for the z3950_search
table in the "Cataloging" section works correctly. Changes made here
should be reflected in the table of Z39.50 search results.
- Test other tables which use columns configuration to confirm that the
changes made in this patch doesn't disrupt their behavior. Test that
any custom columns configuration are applied. For example:
Signed-off-by: George Williams <george@nekls.org> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Owen Leonard [Mon, 8 Jul 2019 18:27:52 +0000 (18:27 +0000)]
Bug 22209: Move stock rotation stage and item forms into modals
This patch makes a number of interface changes to the Stock Rotation
management interface:
- "Add stage" and "Add items" forms are now triggered by clicking new
buttons in the toolbar.
- "Manage stages" and "Manage items" menu items have been added to a
sidebar menu to be displayed when stages or items are being managed.
- JavaScript has been added to move focus to the first form field in
the modal when it is displayed. The "autofocus" attribute is not
sufficent here because the modal is hidden by default.
- Add messages to be shown when there are no items or stages to be
displayed.
- Correct "selected" attributes to use XHTML-style: selected="selected"
(https://wiki.koha-community.org/wiki/Coding_Guidelines#HTML_Templates)
To test, apply the patch and go to Tools -> Stock rotation.
- Create a rota if you don't already have one.
- Manage stages for your rota.
- If your rota has no stages you should see a message along with an
"Add stage" button. The button should trigger the "Add stage"
modal.
- Test the "Add stage" button in the toolbar. It should trigger a
modal dialog containing the form for adding a new stage. The
cursor focus should automatically be on the "library" field.
- Submitting the form should correctly add the stage.
- Verify that there is a new menu in the sidebar, "Manage stages"
and "Manage items."
- Manage items for your rota.
- If your rota has no items you should see a message along with an
"Add items" button. The button should trigger the "Add items"
modal.
- Test the "Add items" button in the toolbar. It should trigger a
modal dialog containing the form for adding new items. The cursor
focus should automatically be on the "barcode" field.
- Submitting either a barcode or a file of barcodes should work
correctly.
- Verify that the new menu items are shown in the sidebar.
Signed-off-by: Maryse Simard <maryse.simard@inlibro.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Kyle M Hall [Thu, 27 Jun 2019 16:12:46 +0000 (12:12 -0400)]
Bug 23228: Add option to automatically display payment receipt for printing after making a payment
Some libraries would like an auto-popup after making a payment so librarians don't have
to navigate to the accounts page, locate the new payment, then click the print button.
Test Plan:
1) Apply this patch
2) Run updatedatabase.pl
3) Make a payment, note no difference in behavior
4) Enable the new syspref FinePaymentAutoPopup
5) Make a payment, note the popup for the payment receipt
Signed-off-by: Lisette Scheer <lisettes@latahlibrary.org> Rescued-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Owen Leonard [Tue, 30 Jul 2019 13:48:02 +0000 (13:48 +0000)]
Bug 23399: (follow-up) Markup comments and corrections
This patch adds comments to the template to highlight the markup
structure. It also corrects some minor markup errors.
This patch should have no effect on the interface or functionality.
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Owen Leonard [Tue, 30 Jul 2019 13:12:18 +0000 (13:12 +0000)]
Bug 23399: Reindent returns.tt
This patch reindents circulation/returns.tt to use four spaces,
following coding guidelines.
To test, apply the patch and use your preferred method for checking the
differences between files while ignoring whitespace. I use diff with the
"-w" flag, but each must take their own journey.
Test the checkin process to confirm that everything still works
correctly.
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Owen Leonard [Wed, 10 Apr 2019 11:30:47 +0000 (11:30 +0000)]
Bug 23286: Improve style of hold confirmation modal
This patch makes minor changes to the hold confirmation modal in the
check-in template and adds some additional style. The goal is to make
the information a little more readable.
To test, apply the patch and rebuild the staff client CSS
(https://wiki.koha-community.org/wiki/Working_with_SCSS_in_the_OPAC_and_staff_client).
Check in items with the following hold statuses:
- On hold for a patron at your library
- On hold for a patron at another library
- On hold and already marked 'Waiting'
Confirm that the hold confirmation modal is clear and well-styled.
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Nadine Pierre <nadine.pierre@inLibro.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Nick Clemens [Tue, 16 Jul 2019 12:08:47 +0000 (12:08 +0000)]
Bug 23322: Correct case for boolean in ES search
I did not include tests only because this is a very small reasonable change and routine has no tests.
It does not affect behaviour, it only touches syntax lightly.
To test:
0 - Set SearchEngine to ElasticSearch
1 - Import the example record (a version is included in sample data in devbox/testing docker so you can skip)
2 - Stage the attached example record
3 - Match using 'ISBN' rule
4 - No matches found
5 - Apply patch
6 - Restart all the things
7 - Reapply matching with no rule
8 - Reapply with ISBN matcing
9 - It matches!
10 - Set SearchEngine to Zebra
11 - Reapply matching with no rule
12 - Reapply with ISBN matching
13 - Matching works as before in Zebra
Signed-off-by: Ron Houk <rhouk@ottumwapubliclibrary.org> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Liz Rea [Mon, 5 Aug 2019 22:39:37 +0000 (22:39 +0000)]
Bug 23431: Don't nullify DOB if it's hidden by sysprefs
To test:
Turn on OPACPatronDetails
put dateofbirth in PatronSelfModificationBorrowerUnwantedField
Have a patron with a set date of birth
Attempt any modification on that patron through the OPAC
The date of birth will be one of the fields changed for that borrower
when you check it in the staff intranet.
Apply this patch, repeat the above.
Date of birth will not be one of the changed fields.
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Owen Leonard [Wed, 31 Jul 2019 16:01:39 +0000 (16:01 +0000)]
Bug 23405: Circulation autocomplete for patron lookup broken if cardnumber is empty
This patch modifies the JavaScript behind the patron search
results autocomplete widget which is displayed when typing in the search
header's "Check out" tab.
The script is modified to use the patron's borrowernumber instead of
cardnumber when redirecting to the checkout page.
Instead of copying the patron's card number into the search form and
triggering a submit, the autocomplete output uses direct links to each
result.
To better handle patrons with no card number, the output is modified to
show card number with parentheses only if card number is present.
To test you should have a patron in your database which has no card
number. Make sure CircAutocompl is enabled.
- From the circulation home page, type a patron name in the "Check out"
form and wait for autocomplete search results to display.
- Patrons with a card number should be listed in the format: Surname,
First name (Card number) Address.
- Patrons without a card number should be listed as: Surname, First
name Address.
- Clicking on either kind of result should link you the checkout screen
for that patron.
Signed-off-by: Maryse Simard <maryse.simard@inlibro.com> Signed-off-by: Ian Walls <ian@bywatersolutions.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Martin Renvoize [Mon, 5 Aug 2019 17:34:55 +0000 (18:34 +0100)]
Bug 11529: (RM follow-up) Add WHILE to directive list
The QA tools don't current recognise the WHILE directive used in this
template update. This patch adds the keyword to the list of recognised
directives and thus allows through unfiltered variables during QA runs.
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Martin Renvoize [Mon, 5 Aug 2019 16:23:45 +0000 (17:23 +0100)]
Bug 11529: (RM follow-up) Fix missing comma in query
Looks like we introduced an error during a rebase somewhere on bug
11529. This patch siply replaces a missng comma in the SQL query for
C4::HoldsQueue::GetHoldsQueueItems.
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Owen Leonard [Thu, 18 Jul 2019 15:42:22 +0000 (15:42 +0000)]
Bug 23339: (follow-up) Markup comments and corrections
This patch adds comments to the template to highlight the markup
structure. It also removes the obsolete "type" attribute from the
<script> tag.
This patch should have no effect on the interface or functionality.
Signed-off-by: Maryse Simard <maryse.simard@inlibro.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Owen Leonard [Thu, 18 Jul 2019 14:58:45 +0000 (14:58 +0000)]
Bug 23339: Reindent addbooks.tt
This patch reindents cataloguing/addbooks.tt to use four spaces,
following coding guidelines.
To test, apply the patch and use your preferred method for checking the
differences between files while ignoring whitespace. I use diff with the
"-w" flag, but you should look into your own heart for the
right solution.
Go to Cataloging. Test that the initial page and search results view
look correct and work correctly.
Signed-off-by: Maryse Simard <maryse.simard@inlibro.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Frédéric Demians [Sat, 29 Jun 2019 06:55:34 +0000 (08:55 +0200)]
Bug 23237: Plugin allow [% INCLUDE %] from template
From a plugin template it is useful to be able to include other templates with
[% INCLUDE %] directives. But TT module is used by Koha with absolute paths.
Relative paths are forbidden for security reasons. A new param [% PLUGIN_DIR %]
allow plugin templates to know where to find plugin home directory.
How to test:
1. Install kitchen-sink plugin.
2. Find tool-step1.tt file, and add this at the begining of the file:
[% INCLUDE "$PLUGIN_DIR/header.tt" %]
It ask to include a template header.tt which doesn't exit.
3. Run kitchen-sink plugin tool. You must have this error message:
Template process failed: file error - _path to plugin
directory_/Koha/Plugin/Com/ByWaterSolutions/KitchenSink/header.tt: not found
quod erat demonstrandum
Signed-off-by: Maryse Simard <maryse.simard@inlibro.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Owen Leonard [Thu, 18 Jul 2019 13:05:48 +0000 (13:05 +0000)]
Bug 23328: Some check-in messages should be dismissable
There are several cases where the check-in process displays a modal
asking for confirmation. There are several cases where confirming or
dismissing the modal unnecessarily reloads the page. In cases where no
server-side action is necessary, the modal should be dismissed without
submitting a form.
To test, apply the patch and go to Circulation -> Check in
With AutomaticItemReturn enabled and AllowReturnToBranch set to "any
library,"
- Check in an item which belongs at another library and is not already
in-transit. In the confirmation modal which appears, clicking the
"OK" button should close the modal without reloading the page.
- Check in another item from anther branch. In the confirmation modal
clicking the "Print slip" button should trigger a pop-up window for
printing a slip but the modal should be dismissed without reloading
the page.
- Check in an item which is already in-transit to another branch. In
the confirmation modal, clicking either the "OK" or "Print transfer
slip" buttons should dismiss the modal without reloading the page.
- Clicking the "Cancel transfer" button should work as before: The
page reloads and the transfer is canceled.
With AutomaticItemReturn disabled,
- Check in an item belonging to another library. The confirmation modal
should ask you whether you want to "Transfer now?" Clicking "No"
should dismiss the modal without reloading the page. The other
options should reload the page and initiate the transfer.
With AllowReturnToBranch set to "only the library the item is from,"
- Check in an item belonging to another library. You should see a
"Cannot check in" modal. Clicking the "OK" button should close the
modal without reloading the page.
Signed-off-by: Maryse Simard <maryse.simard@inlibro.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Bug 23386: Add language of original in advanced search
In advanced search there is a language limit (UNIMARC 101$a), add language of original (UNIMARC 101$c).
This patch adds a TT BLOCK to avoid copy the code.
Test plan:
1) Create some records with language and language of original
2) Go to advanced search page
3) Check limit on language is OK
4) Check limit on language of the original is OK
5) Check using both is OK
Signed-off-by: Maryse Simard <maryse.simard@inlibro.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Owen Leonard [Tue, 11 Jun 2019 18:13:08 +0000 (18:13 +0000)]
Bug 23099: OPAC Search result sorting "go" button flashes on page load
There are a few places in the OPAC where we hide the submit button on a
sorting form because the form auto-submits when the selection changes.
These should be hidden using CSS instead of JS to prevent the temporary
appearance of the submit button while the page loads.
To test, apply the patch and rebuild the OPAC CSS
(https://wiki.koha-community.org/wiki/Working_with_SCSS_in_the_OPAC_and_staff_client).
Test OPAC search results and OPAC checkout history. On both pages you
should not see a "Go" button next to the <select> input for changing the
sort order.
Disable JavaScript in your browser and test those pages again. The "Go"
button should appear.
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Josef Moravec [Fri, 26 Apr 2019 07:33:31 +0000 (07:33 +0000)]
Bug 11529: (follow-up) Fix link on hold request page
Signed-off-by: Josef Moravec <josef.moravec@gmail.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Ere Maijala [Tue, 23 Apr 2019 08:15:31 +0000 (11:15 +0300)]
Bug 11529: Add templates for biblio title display. Unify display.
Signed-off-by: Josef Moravec <josef.moravec@gmail.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Ere Maijala [Thu, 18 Apr 2019 06:27:44 +0000 (09:27 +0300)]
Bug 11529: (follow-up) Remove manage_keywords2koha_mappings permission.
Signed-off-by: Josef Moravec <josef.moravec@gmail.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Ere Maijala [Fri, 12 Apr 2019 14:04:52 +0000 (17:04 +0300)]
Bug 11529: Remove duplicate column name from select query
Signed-off-by: Josef Moravec <josef.moravec@gmail.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Ere Maijala [Fri, 12 Apr 2019 14:00:39 +0000 (17:00 +0300)]
Bug 11529: Replace bibliosubtitle with biblio in all framework sql's.
Signed-off-by: Josef Moravec <josef.moravec@gmail.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Ere Maijala [Fri, 12 Apr 2019 13:59:39 +0000 (16:59 +0300)]
Bug 11529: Update kohafield in default framework only if not already set.
Signed-off-by: Josef Moravec <josef.moravec@gmail.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Ere Maijala [Wed, 12 Dec 2018 12:05:36 +0000 (14:05 +0200)]
Bug 11529: DBIx schema changes
Updates to Biblio schema and removal of FieldMapping schema.
Signed-off-by: Michal Denar <black23@gmail.com> Signed-off-by: Michal Denar <black23@gmail.com> Signed-off-by: Josef Moravec <josef.moravec@gmail.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Ere Maijala [Tue, 20 Nov 2018 11:23:29 +0000 (13:23 +0200)]
Bug 11529: Remove field mapping table and admin page
Signed-off-by: Michal Denar <black23@gmail.com> Signed-off-by: Michal Denar <black23@gmail.com> Signed-off-by: Josef Moravec <josef.moravec@gmail.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Ere Maijala [Mon, 19 Nov 2018 08:37:08 +0000 (10:37 +0200)]
Bug 11529: Clean up subtitle usage
Unify and clean up subtitle usage so that it's always used as a simple array and not the old hash structure.
Signed-off-by: Michal Denar <black23@gmail.com> Signed-off-by: Michal Denar <black23@gmail.com> Signed-off-by: Josef Moravec <josef.moravec@gmail.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Ere Maijala [Thu, 8 Nov 2018 13:30:12 +0000 (15:30 +0200)]
Bug 11529: Simplify and optimize batchRebuildBiblioTables.pl
Signed-off-by: Michal Denar <black23@gmail.com> Signed-off-by: Michal Denar <black23@gmail.com> Signed-off-by: Josef Moravec <josef.moravec@gmail.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Ere Maijala [Mon, 5 Nov 2018 12:22:27 +0000 (14:22 +0200)]
Bug 11529: Use new biblio fields whenever possible
Signed-off-by: Michal Denar <black23@gmail.com> Signed-off-by: Michal Denar <black23@gmail.com> Signed-off-by: Josef Moravec <josef.moravec@gmail.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Ere Maijala [Mon, 5 Nov 2018 12:22:01 +0000 (14:22 +0200)]
Bug 11529: Add new fields to biblio table
Sponsored-by: National Library of Finland Signed-off-by: Michal Denar <black23@gmail.com> Signed-off-by: Michal Denar <black23@gmail.com> Signed-off-by: Josef Moravec <josef.moravec@gmail.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Kyle M Hall [Thu, 9 May 2019 10:57:12 +0000 (06:57 -0400)]
Bug 22610: (QA follow-up) Make upgrade query more accurate
Signed-off-by: Liz Rea <wizzyrea@gmail.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Martin Renvoize [Fri, 19 Jul 2019 11:27:33 +0000 (12:27 +0100)]
Bug 22610: (QA follow-up) Add unit tests for FeePayment
Signed-off-by: Liz Rea <wizzyrea@gmail.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Martin Renvoize [Thu, 9 May 2019 08:37:01 +0000 (09:37 +0100)]
Bug 22610: (follow-up) Correction to accounts tests
Signed-off-by: Liz Rea <wizzyrea@gmail.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Liz Rea <wizzyrea@gmail.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Martin Renvoize [Wed, 24 Apr 2019 13:22:35 +0000 (14:22 +0100)]
Bug 22610: Update SIP2 to use payment_type
The SIP2 interface has long used a set of accounttypes to denote payment
types. Now we have an authorised list of payment_types and a
payment_type field in accountlines this patch alters the logic to use
it.
Signed-off-by: Liz Rea <wizzyrea@gmail.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Martin Renvoize [Wed, 24 Apr 2019 13:20:49 +0000 (14:20 +0100)]
Bug 22610: Update SIP payment accounttypes
This DB update updates the Pay00, Pay01 and Pay02 accounttypes to all
be 'Pay' and adds the corresponding payment_types into the
authorised_values
Signed-off-by: Liz Rea <wizzyrea@gmail.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Nick Clemens [Fri, 28 Jun 2019 12:53:20 +0000 (12:53 +0000)]
Bug 14549: POD and variable cleanup
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Nick Clemens [Fri, 28 Jun 2019 12:37:25 +0000 (12:37 +0000)]
Bug 14549: Check patrons reserves for any holds on a bib when checking out an item
MoveReserve uses CheckReserves to see if the current patron has any holds
on the title they are checking out, however, CheckReserves doesn't return
all holds on a biblio, it returns holds on the item from the holdsqueue
if they exist
This can create a condition where we check holds on an item, find we have it planned for
another borrower, confirm checkout to the current borrower, but don't fill their hold
To test:
1) Find record
2) place record level holds for 2 different patrons (record level)
3) Run holds queue builder, check the queue to confirm an item was selected for patron 1
Circulation->Holds queue->Library="All"
4) Check out the item queued for patron with priority 1 to the second patron
5) You should be asked to confirm, do so
6) Note the item checks out, but both holds remain
7) Apply patch
8) Check in the item
9) Don't confirm the hold
10) Check the holds on the record and the holds queue
11) Patron 1 should be priority 1 with an item selected from the holds queue
12) Checkout to patron 2 as before
13) Note the hold for patron 2 is filled this time
14) Prove -v t/db_dependent/Reserves.t
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Nick Clemens [Fri, 28 Jun 2019 12:36:16 +0000 (12:36 +0000)]
Bug 14549: Unit tests
To test:
1 - Apply just this patch
2 - prove -v t/db_dependent/Reserves.t
3 - Failure
4 - Apply second patch
5 - prove -v t/db_dependent/Reserves.t
6 - Success!
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Nick Clemens [Tue, 30 Jul 2019 13:37:28 +0000 (13:37 +0000)]
Bug 23396: Add keyboard_shortcuts.sql to C4/Installer.pm
To test:
1 - Back up your DB if you want to save it
2 - sudo koha-mysql kohadev
DROP database koha_kohadev;
CREATE database koha_kohadev;
3 - http://localhost:8081
4 - Go through the web installer
5 - Enable AdvancedCatalogingEditor
6 - Try to load it, fails with JS console error: insert_copyright is not defined
7 - Apply patch
8 - Repeat
9 - This time editor loads
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Bug 10492: Translation problems with TT directives in po files
This patch implements the replacement of TTvariables
'[%...%]' with normal placeholders '%s' for text
inside HTML tags (eg. img, meta, input)
The replacement is done in two files:
* xgettext.pl, used on create/update, so TTvars are not
found on the text to translate (msgid)
* tmpl_proccess3.pl, used on install time, so the correct
translation is found (msgstr) and the right TTvar is put on
the translated text.
To test:
Before applying the patch
1) Update your favorite language
cd misc/traslator
perl translate update xx-YY
2) Build a list (ini.txt) of 'msgid' to do a comparison
msgcat --no-wrap --use-first po/xx-YY-*po -o - | egrep "^msgid" | sort > ini.txt
3) Apply the patch
4) Update your favorite language, again
cd misc/traslator
perl translate update xx-YY
5) Build a final list (end.txt) of 'msgid' to do a comparison
msgcat --no-wrap --use-first po/xx-YY-*po -o - | egrep "^msgid" | sort > end.txt
6) Compare both files, you must find (most) TTvars replaced by '%s'
diff ini.txt end.txt
for example:
< msgid "Translate item type [% itemtype.itemtype | html %]"
> msgid "Translate item type %s"
< msgid "Holds on this item: [% item_loo.item_holds | html %] / Total holds on this record: [% item_loo.holds | html -%]"
> msgid "Holds on this item: %s / Total holds on this record: %s"
< msgid "tag_anchor_[% innerloo.tag | html %]_[% innerloo.index | html %][% innerloo.random | html %]"
> msgid "tag_anchor_%s_%s%s"
< msgid "[% innerloo.tag_lib | html %] - Click to Expand this Tag"
> msgid "%s - Click to Expand this Tag"
7) Translate one of the examples, with more than one variable if
possible, for example this text in xx-YY-staff-prog.po
> msgid "Holds on this item: %s / Total holds on this record: %s"
Check it's not marked as 'fuzzy'
8) Apply the translation
perl translate install xx-YY
9) Check the translated string has all variables in the right order
edit koha-tmpl/intranet-tmpl/prog/es-ES/modules/tools/batchMod-edit.tt
around line '187', first '[% item_loo.item_holds | html %]', then
'[% item_loo.holds | html -%]' on this case,
or use another example
If approved this patch can be backported to current stable
versions.
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Owen Leonard [Wed, 31 Jul 2019 12:38:16 +0000 (12:38 +0000)]
Bug 21518: Material type "three-dimensional artifact" displays as "visual material"
This patch makes a few corrections to the staff client MARC21 XSLT so
that the correct material type icons are displayed for pictures and
realia. The more-specific material type handling has been adapted from
the corresponding XSL files in the OPAC.
To test you must have default XSLT enabled and the DisplayIconsXSLT and
DisplayOPACiconsXSLT system preferences enabled.
- Apply the patch and locate records with "type of record" specified in
the leader as 'g', 'k', and 'r'.
A sample MARC file will be attached to the bug report with one of
each type of record. Import the records and search your catalog for
"Bug_21518."
- View the records in search results and their detail pages, both in
the OPAC and the staff client. In all cases the correct material type
icon should be displayed.
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Colin Campbell [Tue, 2 Jul 2019 09:58:41 +0000 (10:58 +0100)]
Bug 23251: Correct formatting of IMD data ending in apostrophe
IMD text data may end in an apostrophe (e.g. dreamin' )
This was causing the segment to be incorrectly formatted
as only the last character was checked, not the preceding
character to check whether it was quoted
add a test for this specific occurence
Signed-off-by: Hayley Mapley <hayleymapley@catalyst.net.nz> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Bug 23345: Rename include-indexes to exclude-indexes in koha-dump
Trivial edit. The usage statement is wrong.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Owen Leonard [Thu, 27 Jun 2019 13:24:36 +0000 (13:24 +0000)]
Bug 23226: Remove type attribute from script tags: Cataloging
This patch removes the "type" attribute from <script> tags one
cataloging and one authorities template.
To test, apply the patch and confirm that examples of affected pages
work properly without any JavaScript errors in the browser console:
- Cataloging -> Cataloging home page
- Cataloging -> Cataloging home page -> Search results
- Authorities -> New authority -> New from Z39.50/SRU
Validating the HTML source of any of these pages should return no errors
related to the "type" attribute.
Signed-off-by: frederik chenier <frederik.chenier@inlibro.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Ere Maijala [Mon, 29 Apr 2019 08:03:22 +0000 (11:03 +0300)]
Bug 22524: Fix date/time-last-modified search with Elasticsearch
Avoid using slash in the field name since it would need to be escaped. Fix conversion of dtlm and any existing mapping.
Signed-off-by: Liz Rea <wizzyrea@gmail.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Ere Maijala [Tue, 16 Apr 2019 13:26:40 +0000 (16:26 +0300)]
Bug 22524: Fix publication date and year search with Elasticsearch
Also fixes the mappings.yaml to use correct field name (left over issue from bug 19575), so reset mappings and reindex before testing.
Test plan:
1. Reset mappings and reindex biblios.
2. Check that tests in t/db_dependent/Koha/SearchEngine/Elasticsearch/QueryBuilder.t pass.
3. Try that all of the following year range type work in publication date search and year limit in advanced search:
yyyy
yyyy-yyyy
-yyyy
yyyy-
Signed-off-by: Liz Rea <wizzyrea@gmail.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Jonathan Druart [Sat, 29 Jun 2019 15:55:17 +0000 (10:55 -0500)]
Bug 23217: Remove SQL error when batch patron mod and not attribute selected
On the batch patron modification tool, if no patron attribute is selected then
an UPDATE query will be executed anyway. Indeed the form will send a
an empty "patron_attributes" parameter. We need to handle it.
Test plan:
Go to the patron modification tool
Enter a cardnumber
Change a field (like city)
Do not change anything in the patron's attributes
Save
=> Without this patch a SQL error is generated:
DBD::mysql::st execute failed: Cannot add or update a child row: a foreign key constraint fails (`koha_kohadev`.`borrower_attributes`, CONSTRAINT `borrower_attributes_ibfk_2` FOREIGN KEY (`code`) REFERENCES `borrower_attribute_types` (`code`) ON DELETE CASCADE ON UPDATE CASCADE) [for Statement "INSERT INTO borrower_attributes SET attribute = ?, code = ?, borrowernumber = ?" with ParamValues: 0=undef, 1="", 2="51"] at /home/vagrant/kohaclone/C4/Members/Attributes.pm line 287.
=> With this patch applied you will not see it
You should also test that you can modify patron's attributes ;)
Signed-off-by: Hayley Mapley <hayleymapley@catalyst.net.nz> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Liz Rea [Thu, 25 Apr 2019 15:34:36 +0000 (15:34 +0000)]
Bug 21716: Escape publisher in item search
To prevent endless processing errors.
To test:
* create a biblio with a publisher with a backslash - i.e. 260$b with
graham\lineham
* do an item search that will include that title in the results
* wait forever, because it won't work.
* apply this patch
* repeat steps, notice that you
a. get results
b. your result is listed with it's correct publisher
* rejoice
Signed-off-by: Hayley Mapley <hayleymapley@catalyst.net.nz> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
projects / koha.git / log