David Cook [Wed, 4 Jan 2023 00:52:25 +0000 (00:52 +0000)]
Bug 30962: Add unit tests for /auth/password/validation endpoint
Test plan:
0. Apply patch
1. prove -v t/db_dependent/api/v1/password_validation.t
Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit ac5fbd1eb66874583c305a06353a3c067cd0e5cc) Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
This patch adds an endpoint for /auth/password/validation
This allows a third-party, using an authenticated and authorized Koha
API user, to check if the username and password given by a user is
correct in Koha.
For example, a Keycloak extension can be created using its
User Storage SPI to use Koha as the user database for Keycloak. This
API allows us to authenticate the user as a particular Koha user - without
creating a Koha user session for them.
Test plan:
0. Apply patch and koha-plack --restart kohadev
1. Go to http://localhost:8081/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=RESTBasicAuth
2. Enable "RESTBasicAuth"
3. Run the following commands while substituting correct values for <koha_user> and <koha_password>
3. curl -XPOST -H "Content-Type: application/json" -u <koha_user>:<koha_password> http://localhost:8081/api/v1/auth/password/validation -d '{ "username": "<koha_username">, "password": "<koha_password>" }' -v
4. Note "204 No Content" response
5. curl -XPOST -H "Content-Type: application/json" -u <koha_user>:<koha_password> http://localhost:8081/api/v1/auth/password/validation -d '{ "username": "<koha_username">, "password": "this is definitely not the password" }' -v
6. Note "400 Bad Request" response and error message {"error":"Validation failed"}
Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit a8a356404c197e45eedc6c01847cf1811a1cc037) Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
Owen Leonard [Wed, 18 Jan 2023 15:41:51 +0000 (15:41 +0000)]
Bug 32672: Incorrect CSS path to jquery-ui
This patch removes links to jQueryUI assets which are not required in
the self-checkout and self-checkin pages.
The patch also adds missing JS to the self-checkin page related to
internationalization. This prevents a JS error related to an undefined
function, "__".
To test, apply the patch and view the main pages in self-checkout and
self-checkin, and the help page in self checkout. There should be no
errors in the browser console related to missing files.
Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 410b9ee35f29d9065425036dfd8099ba28911170) Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
Kyle Hall [Tue, 3 Jan 2023 13:14:50 +0000 (08:14 -0500)]
Bug 32537: (QA follow-up): Tidy code
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 2570062d25621d134700eb4f174b44bd93d43799) Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
Kyle Hall [Tue, 3 Jan 2023 13:12:08 +0000 (08:12 -0500)]
Bug 32537: (QA follow-up) Don't allow invalid no block values
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit b1867f84852c546958a584b93c4d31af954c6e06) Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
Nick Clemens [Tue, 27 Dec 2022 20:21:15 +0000 (20:21 +0000)]
Bug 32537: Add no-block option to SIP cli emulator
This patch adds the option to pass a no-block option and use this
in checkout/checkin/renew messages
To test:
1 - perl misc/sip_cli_emulator.pl -a localhost -p 6001 -l CPL -su term1 -sp term1 -m checkin --item 39999000010831
2 - Confirm out like:
SEND: 09N20221227 20183920221227 201839APCPL|AOCPL|AB39999000010831|ACterm1|BIN|
(Note the N after 09)
3 - Apply patch
4 - Restart SIP, repeat 1
5 - Confirm still an N
6 - perl misc/sip_cli_emulator.pl -a localhost -p 6001 -l CPL -su term1 -sp term1 -m checkin --item 39999000010831 -n N
7 - Confirm still an N
8 - perl misc/sip_cli_emulator.pl -a localhost -p 6001 -l CPL -su term1 -sp term1 -m checkin --item 39999000010831 -n Y
9 - Confirm the send has a Y after 09
Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 0880d809492f4011ef4cfac32129df4a2dd1fa71) Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
Nick Clemens [Thu, 2 Feb 2023 14:57:14 +0000 (14:57 +0000)]
Bug 32797: Check if fields have a value, not if true
When saving OAI set mappgins we are checking for truth, this prevents
saving subfield 0. We should check for content
To test:
1 - Go to Admin->OAI sets
2 - Create a set
3 - Define mappings for the set
4 - Attempt to save a rule on field 952 subfield 0 (withdrawn)
5 - It does not save
6 - Apply patch
7 - Try again
8 - Success!
Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 6f606e00c597cfdfb30fe969b061a331c8a372db) Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
Jonathan Druart [Wed, 18 Jan 2023 13:32:23 +0000 (14:32 +0100)]
Bug 32673: Remove misc/load_testing/ scripts
see comment 0 for more info
Signed-off-by: David Cook <dcook@prosentient.com.au> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 3bf31ae4d4dec818c48b4833e128d0a49c3419f3) Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
Marcel de Rooy [Fri, 3 Feb 2023 09:45:03 +0000 (09:45 +0000)]
Bug 32612: (QA follow-up) Add missing interface for Logger
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 89ff35b0250de99b14f749e6961a73f3ee398768) Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
Marcel de Rooy [Fri, 3 Feb 2023 09:41:11 +0000 (09:41 +0000)]
Bug 32612: (QA follow-up) Remove worker.log
It is not used; overruled by daemon's --output option.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 94cb6925d409cdd8bf1ff5b59805e6375ef3e874) Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
Marcel de Rooy [Fri, 3 Feb 2023 08:14:06 +0000 (08:14 +0000)]
Bug 32612: (QA follow-up) Remove more unneeded appender lines
To be more consistent ;)
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit c37c3e874ca5b931017301ff6abcf17913a1b2bc) Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
Kyle Hall [Thu, 2 Feb 2023 11:53:53 +0000 (06:53 -0500)]
Bug 32612: (QA follow-up) Update package files
Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit cb1da500ec1d409c836b66e0a0a1836c2d56b1fe) Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
Kyle Hall [Wed, 1 Feb 2023 17:37:44 +0000 (12:37 -0500)]
Bug 32612: (QA follow-up) Remove superfluous line
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 09e0f8e30db2b99556d32cbf0276fbe4e117ebab) Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
Nick Clemens [Wed, 11 Jan 2023 18:46:11 +0000 (18:46 +0000)]
Bug 32612: Add worker-error to log4perl conf
To test:
1 - Apply patch
2 - vim /etc/koha/sites/kohadev/log4perl.conf, Add lines below:
log4perl.logger.worker = WARN, WORKER
log4perl.appender.WORKER=Log::Log4perl::Appender::Screen
log4perl.appender.WORKER.stderr=1
log4perl.appender.WORKER.mode=append
log4perl.appender.WORKER.layout=PatternLayout
log4perl.appender.WORKER.layout.ConversionPattern=[%d] [%p] %m %l%n
log4perl.appender.WORKER.utf8=1
3 - Restart all
4 - Edit misc/background_jobs_worker.pl
- my $job = Koha::BackgroundJobs->find($args->{job_id});
+ my $job;# = Koha::BackgroundJobs->find($args->{job_id});
5 - In another terminal: tail -f /var/log/koha/kohadev/koha-worker-error.log
6 - Force enqueue a job (that won't be found because of #4
perl -e 'use Koha::BackgroundJob::BatchUpdateItem; my $bg = Koha::BackgroundJob::BatchUpdateItem->new(); $bg->enqueue({ record_ids=>['888888']});'
7 - Note error in log like:
[2023/01/11 19:26:10] [WARN] No job found for id=2983 main:: /kohadevbox/koha/misc/background_jobs_worker.pl (111)
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 3b1f2c57eaed978845eef3824c7311da06099bc5) Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
I assumed it wasn't needed because teh .tt files using this already
includ teh Koha plugin. But we shuoldn't skip, just in case someone
doesn't notice when reusing this, and debugging will be a pain.
Sorry for that.
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 1b6e9c7bd1c6e50ab610c6d15fe2e46af2f666ec) Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
This patch fixes a duplicate attribute code for Author-in-order in the
biblios definition.
The picked code matches what was already in ccl.properties.
Also Chronological-term for authorities gets fixed.
To test:
1. Apply the regression tests
2. Run:
k$ prove xt/verify_bib1.att.t
=> FAIL: Some failiures
3. Apply this patch
4. Repeat 1
=> SUCCESS: Tests now pass!
5. Sign off :-D
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit a4999a289563281c2b6956edb94fc6e1b20ad54e) Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 74513307292745add212d39d5564309188159dea) Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
Jonathan Druart [Wed, 1 Feb 2023 13:06:27 +0000 (14:06 +0100)]
Bug 32779: ERM - Fix import from list
There is a typo, '$' is missing, which caused the following error:
Use of inherited AUTOLOAD for non-method Koha::BackgroundJob::CreateEHoldingsFromBiblios::fix_coverage() is no longer allowed at /kohadevbox/koha/Koha/BackgroundJob/CreateEHoldingsFromBiblios.pm line 126
Test plan:
Create a list, add an item
Turn on ERM
Create a package
Go to /cgi-bin/koha/erm/eholdings/local/titles
Click "Import from list"
Select the package, then your list, and import
It should succeed
Signed-off-by: Pedro Amorim <pedro.amorim@ptfs-europe.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit d8022865cabf814c6d99882312b8422e3b8326d6) Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
Jonathan Druart [Wed, 1 Feb 2023 13:28:23 +0000 (14:28 +0100)]
Bug 32779: Add tests
Signed-off-by: Pedro Amorim <pedro.amorim@ptfs-europe.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 4288ba2ff8419d40a8a19b360193b2c33c87703a) Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
HTTP headers can only contain ASCII characters, and it is thus
impractical to use a header for passing DB queries that could contain
non-ascii characters.
We don't need it, and should be removed.
This patch removes traces from the datatables.js files and also from
detail.tt, which had it set to false anyway.
See bug 32406 and bug 32409 for the cases in which it was being used,
and problematic.
Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit a4546536298a8c921de434de0ea3fbd58c6dd303) Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
Bug 32409: Fix cashup searching with non latin-1 chars
This patch fixes a problem with the way queries are passed to the API so
cashups are searchable with non-laint1 chars.
To test:
1. Have two superlibrarian users, one with non-latin1 chars on the name
(e.g. خمسة)
2. Setup a debit type that can be sold.
3. Use the POS module to have some activity, using both your regular
user and the other one.
4. Go to the register you used, and choose 'Transaction history'
5. Perform a couple cashups with each user ('Record cashup').
6. Look at the 'Cashup history' table
=> SUCCESS: You see cashups for both users
7. Use the 'Search' filter with latin chars
=> SUCCESS: Your user with only latin1 chars is displayed on the table
8. Repeat, using some non-latin1 char found on the other user
=> FAIL: Table is not refreshed or filtered!
9. Apply this patch
10. Reload the page
11. Repeat 8
=> SUCCESS: Filtering works now!
12. Sign off :-D
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 96cba5503c896b01bb4eb7eab326d2fa8c4b96dc) Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
David Cook [Mon, 5 Dec 2022 22:50:23 +0000 (22:50 +0000)]
Bug 32406: Switch acq datatable from headers to query param
This patch changes the pending orders datatable from using the
x-koha-query header to the "q" query parameter, so that it is
able to support UTF-8 encoded scripts rather than just Latin-1
scripts.
Test plan:
1. Apply patch
2. Go to
http://localhost:8081/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=29
3. Change title from "Gairm" to "五" (alternatively use "cœur" or Arabic title)
4. Create a basket containing multiple records including bib 29 五
5. Close the basket
6. Receive shipment
7. You should be on a page like the following:
http://localhost:8081/cgi-bin/koha/acqui/parcel.pl?invoiceid=3
8. In the search box, type in 五
9. Note that you see a "Processing..." box and then the
results are filtered to just show the order for 五
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
tcohen amend: removed the line instead as we are probably phasing out
that DT configuration option anyway.
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 9248a0ef1f49677d52fb47aa5556215793bf218c) Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
Martin Renvoize [Tue, 31 Jan 2023 14:15:53 +0000 (14:15 +0000)]
Bug 32633: (QA follow-up) Add handling for authorities merge
When you first click 'actions -> merge' from a result in the authories
search page you will see a new 'Merging with authority: ' text appear at
the top of the search results.
Prior to this patch, the text appears outside of the white page-section
and is almost un-noticable.
After this patch, we add a page-section with bg-info (blue backround)
around the merge message which makes it stand up more clearly.
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit c2664482e4d82c0a728301dfb57476909c3f609c) Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
This follow-up makes a small change to the page-section nesting on the
Cataloging and Authorities search results pages. We move the 'h2'
outside of the page section but include the paging and number of results
inside with the results tables themselves.
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 734a1fe63ba52b9ce214bb8129493b8184a6f59d) Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
Owen Leonard [Fri, 13 Jan 2023 12:12:30 +0000 (12:12 +0000)]
Bug 32633: Add 'page-section' to cataloging and authority pages
This patch adds a "page-section" container div around the main section
of cataloging and authority pages which lack it.
This patch contains indentation changes, so please ignore whitespace
when looking at the diff.
Apply the patch and view the following pages to confirm that the main
content is contained in a white box:
- Cataloging -> Cataloging search results
- Cataloging -> Edit items: The table of items and the item edit form
should each be contained in a page-section.
- Authorities -> Search results
- Authorites -> Merge authorities: From the authorities search results
list, click "Actions -> Merge" for one result, and then "Actions ->
Merge" for another.
- Click "Next" after selecting a merge reference.
- The "Destination record" information should be contained in a
page-section.
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit b88ec7daeb9749d79ceca99277de2d0a1a3f26ae) Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
Jonathan Druart [Tue, 3 Jan 2023 17:16:24 +0000 (18:16 +0100)]
Bug 30310: Fix date_to_rfc3339
We need the customParseFormat plugin to provide a custom date format to
the dayjs constructor.
Found while working on bug 32559, don't remove this function, it will be
used later.
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit dded614fa1735f35b0ee34869f5e45b87262382b) Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
Jonathan Druart [Tue, 3 Jan 2023 16:55:02 +0000 (17:55 +0100)]
Bug 30310: Replace one more occurrence to moment
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit e6af365491f7f5b56f545e3184cc46e0984b9c05) Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
Jonathan Druart [Fri, 4 Nov 2022 09:54:31 +0000 (10:54 +0100)]
Bug 30310: Add missing utc plugin
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit dbfbd4c9837903c1f4b7256ea0e5bcdfed12fda8) Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
Jonathan Druart [Tue, 31 May 2022 13:13:32 +0000 (15:13 +0200)]
Bug 30310: Adjust about page
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Edit: I fixed a rebase issue that was being carried Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit f847055586ace121cf10801bbd785b8ea1d17edd) Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
Jonathan Druart [Tue, 31 May 2022 13:12:11 +0000 (15:12 +0200)]
Bug 30310: Remove momentjs
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit d8cc4950bf652733f25ad4060551a1472396247c) Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
Jonathan Druart [Tue, 31 May 2022 13:09:43 +0000 (15:09 +0200)]
Bug 30310: Adjust js-date-format
Test plan:
Confirm that the test plan from bug 24455 is still passing
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 63242128a12a455de8c5339318df3ad88607d1bf) Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
Jonathan Druart [Tue, 31 May 2022 11:52:51 +0000 (13:52 +0200)]
Bug 30310: Add dayjs timezone plugin
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 37c6d4fcccb0e87147e3c6022386eeb5ef0af021) Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
Martin Renvoize [Mon, 30 Jan 2023 17:27:53 +0000 (17:27 +0000)]
Bug 31095: (Rebase follow-up) Correct fine rules and AddIssue calls
This patch corrects the errant call to AddIssue that passes a patron
object instread of a patron hash to AddIssue in the tests and also adds
lengthunit to squash a pair of warnings.
However, it doesn't resolve the failing test.. still somthing going on
there.
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Bug 31095: Fix Circulation.t
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 50f997a4b4376845cd812980e0e667698dd7f0f8) Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit ebb3eac6a142d649df7bb900a7dcffed84090f66) Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit f0b37d31315ef24cff11ad101dca7886a0d42ee6) Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
Nick Clemens [Fri, 16 Sep 2022 15:52:13 +0000 (15:52 +0000)]
Bug 31095: (follow-up) Iterate debarments in batch mod
Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 847d50f865c4a8b591163041fd987001ecda2ead) Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
Martin Renvoize [Tue, 18 Oct 2022 14:01:02 +0000 (15:01 +0100)]
Bug 31095: (QA follow-up) Fix after rebase
Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit f73bafaf877b53702ca3095dc81406e499b5e0e3) Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
Martin Renvoize [Thu, 25 Aug 2022 09:22:39 +0000 (10:22 +0100)]
Bug 31095: Remove GetDebarments from Koha::Patron::Debarments
This patch finally removes GetDebarments from the codebase.
Test plan
1. Confirm GetDebarments is no longer mentioned in the codebase. `git
grep GetDebarments`
2. Confirm t/db_dependent/Patron/Borrower_Debarments.t continues to pass
Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 7c1ffd2b11501fdcedb8e7dd2e2838283c847ede) Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
Martin Renvoize [Thu, 25 Aug 2022 09:16:46 +0000 (10:16 +0100)]
Bug 31095: Remove GetDebarments from Borrower_Debarments.t
This patch replaces calls to GetDebarments with teh
$patron->restritions->search() equivilents.
Test plan
1. Run the test prior to the patch and confirm it passes
2. Run the test after the patch and confirm it passes
3. Confirm no tests were removed
Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 52c786205e00afb17d0757483c157387dd229445) Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
Martin Renvoize [Thu, 25 Aug 2022 08:23:36 +0000 (09:23 +0100)]
Bug 31095: Remove GetDebarments from Restriction/Type.t
This patch replaces GetDebarments with $patron->restrictions in
t/db_dependent/Koha/Patron/Restriction/Type.t
Test plan
1. Confirm t/db_dependent/Koha/Patron/Restriction/Type.t passes prior to
the patch
2. Confirm t/db_dependent/Koha/Patron/Restriction/Type.t passes after
the patch
3. Confirm no tests were removed
Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 4a3a22f2b43174a61220e651400f9207a1b5d97e) Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
Martin Renvoize [Thu, 25 Aug 2022 08:11:13 +0000 (09:11 +0100)]
Bug 31095: Remove GetDebarments from MarkIssueReturned.t
This patch removes GetDebarments from Ciculation/MarkIssueReturned.t
Test plan
1. Confirm t/db_dependent/Circulation/MarkIssueReturned.t passes prior
to the patch
2. Confirm t/db_dependent/Circulation/MarkIssueReturned.t passes after
the patch
3. Confirm no tests have been removed
Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit f35fb719774ca1965d9406e86816a318bac893c6) Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
Martin Renvoize [Thu, 25 Aug 2022 08:00:51 +0000 (09:00 +0100)]
Bug 31095: Remove GetDebarments from maxsuspensiondays.t
This patch replaces GetDebarments in maxsuspensiondays.t with calls to
the restrictions accessor.
Test plan
1. Confirm t/db_dependent/Circulation/maxsuspensiondays.t passes prior
to this patch
2. Confirm t/db_dependent/Circulation/maxsuspensiondays.t passes after
this patch
3. Confirm no tests have been removed in this patch
Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 07d3426ae82335dd64c5f0090ca175f0126d33cd) Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
Martin Renvoize [Thu, 25 Aug 2022 07:56:54 +0000 (08:56 +0100)]
Bug 31095: Remove GetDebarments from Patron::Import
This patch replaced GetDebarments with $patron->restrictions->search in
Koha::Patron::Import.
Test plan
1. Confirm that importing patrons with debarred and debarredcomment
fields in the import still works as expected
Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 9ea8cf0a8f5a5a827f1f553923a016811d04de9b) Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
Martin Renvoize [Thu, 25 Aug 2022 07:36:37 +0000 (08:36 +0100)]
Bug 31095: Remove GetDebarments from Circulation.t
Replace GetDebarments with $patron->restrictions.
Test plan
1. Run test prior to patch - all should pass
2. Run test after patch - all should pass
3. Confirm no tests were removed as part of the patch
Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 445223623378e16c76870acb53d027ac1d41b851) Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
Martin Renvoize [Wed, 24 Aug 2022 15:47:54 +0000 (16:47 +0100)]
Bug 31095: Remove GetDebarments from Circulation.pm
This patch removes GetDebarments from Circulation.pm replacing them with
calls to $patron->restrictions and filtering using a chained search
call.
Test plan
1. Confirm that t/db_dependant/Circulation.t continues to pass
Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 0f15a74853b05ea2372a99fce1500ac1b15b5baf) Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
Martin Renvoize [Wed, 24 Aug 2022 15:30:43 +0000 (16:30 +0100)]
Bug 31095: Remove GetDebarments from tools/modborrowers.pl
This patch removes GetDebarments from the modborrowers tool controller
and replaces it with $patron->restrictions as appropriate.
Test plan
1. Confirm that the 'Batch patron modification' tool pages still load
and perform as expected.
Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit e44c5146d367a6c4b76ef5c03446ba34574642ee) Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
Martin Renvoize [Wed, 24 Aug 2022 15:20:05 +0000 (16:20 +0100)]
Bug 31095: Remove keyed_on_code
We no longer require keyed_on_code from Koha::Patron::Restrictoin::Types
as we have relation accessors for the relevent use cases and no longer
reference the method anywhere in the codebase!
Test plan
1. Confirm 'keyed_on_code' is no longer referenced anywhere in the
codebase.
`git grep keyed_on_code`
Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 700bff51e97619ce3b6266b5b590736006814437) Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
Martin Renvoize [Wed, 24 Aug 2022 15:16:34 +0000 (16:16 +0100)]
Bug 31095: Remove borrower_debarments and patron_restrictions includes
This patch removes the aforementioned includes and drops the last
remaining reference to them.
We have replaces these includes with patron-restrictions-tab.inc and
restriction-types.inc.
Test plan
1. Confirm the includes are no longer referenced anywhere in the
codebase. 'git grep borrower_debarments.inc', 'git grep
patron_restrictions.inc'
Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 6388fbbd7f60dd65cbcf71a16e9cafe88a3c8a87) Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
Martin Renvoize [Wed, 24 Aug 2022 15:14:59 +0000 (16:14 +0100)]
Bug 31095: Remove GetDebarments from members/memberentry.pl
This patch removes the use of GetDebarments from members/memberentry.pl
and replaces the references in the templates with patron.restrictions.
Test plan
1. Add a new user and confirm that the patron restrictions section does
not appear on the form
2. Edit the user and confirm the patron restrictions section now appears
3. Add a manual restriction using the patron edit form
4. Confirm the restriction appears on the patron edit form
5. Confirm you can remove the restriction usine the patron edit form
Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 401794687626f5333476a0174d2cbe1ab6a8f465) Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
Martin Renvoize [Wed, 24 Aug 2022 15:13:26 +0000 (16:13 +0100)]
Bug 31095: Remove GetDebarments from members/moremember.pl
This patch removes the use of GetDebarments from members/moremember.pl
and replaces template references with patrons.restrictions and the new
includes introduced in the prior patch
Test plan
1. Confirm that the 'Restrictions (x)' tab still appears on the patron
details page.
2. Confirm that the 'Restrictions (x)' tab count is correct
3. Confirm that the 'Restrictions (x)' tab table functions
4. Confirm that the 'Restrictions (x)' tab 'Add manual restriction' form
works as expected
Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit efd9ed271c703ef104b9ff8da1a06a98b9f4d0bb) Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
Martin Renvoize [Wed, 24 Aug 2022 15:11:43 +0000 (16:11 +0100)]
Bug 31095: Remove GetDebarments from circ/circulation.pl
This patch remove the use of GetDebarments from circ/circulation.pl,
replacing it with a reference to patron.restrictions in the template and
includes.
Test plan
1. Confirm that the 'Restrictions (x)' tab still appears on the checkout
page for a user.
2. Confirm that the 'Restrictions (x)' tab count is correct
3. Confirm that the 'Restrictions (x)' tab table functions
4. Confirm that the 'Restrictions (x)' tab 'Add manual restriction' form
works as expected
Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 2a9ad2691295ab1d2b70706f380c93e626c48d88) Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
Martin Renvoize [Wed, 24 Aug 2022 15:01:27 +0000 (16:01 +0100)]
Bug 31095: Add type relation accessor to Koha::Patron::Restriction
Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 55d5e0a40d1d688ddaa734db6ff6a68a977d594f) Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
Martin Renvoize [Wed, 24 Aug 2022 15:00:52 +0000 (16:00 +0100)]
Bug 31095: Add restrictions accessor to Koha::Patron
Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 83b3ccc3c805c1810d362811335a3cc28de3a561) Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 437e752938b7c422676845b8df1619fa2270a887) Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
Emmi Takkinen [Wed, 30 Nov 2022 10:33:19 +0000 (12:33 +0200)]
Bug 32377: Set param skiptotals on call of GetBudgetHierarchy in acqui/histsearch.pl
Calling GetBudgetHierarchy from acqui/histsearch.pl
is slow if param skiptotals is not used.
To test:
1. Open browsers Console -> Network (F12).
2. Navigate to Order search page and perform search.
=> Take a note how long it takes to load the Search results page.
3. Apply this patch.
4. Repeat step 2.
=> Page should now load faster.
Sponsored-by: Koha-Suomi Oy Signed-off-by: Frédéric Demians <f.demians@tamil.fr> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 0f5daaa553bc63bd2c08212ee8db3d56c52781e9) Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
Owen Leonard [Fri, 20 Jan 2023 11:56:55 +0000 (11:56 +0000)]
Bug 32688: Convert recalls awaiting pickup tabs to Bootstrap
This patch updates the recalls awaiting pickup template
(recalls_waiting.tt) to replace a set of jQueryUI tabs. They are
converted to Bootstrap in order to complete Bug 29226.
To test, apply the patch and make sure the "UseRecalls" system
preference is enabled.
- Go to Circulation -> Recalls awaiting pickup.
- You should see two tabs, "Recalls waiting" and "Recalls waiting over X
days."
- The tabs should look correct and work correctly.
Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Lucas Gass <lucas@bywatersolutions.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 4877666fb5fed6fcab03063603a4d00cdbb7d1e0) Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
Lucas Gass [Mon, 9 Jan 2023 18:32:39 +0000 (18:32 +0000)]
Bug 32239: Remove uneeded CSS from reports.css
To test:
1. Apply patch.
2. When adding a new SQL report, the options for adding/creating groups and sub groups should be aligned properly.
3. Turn on Mana and look at Mana Knowledge Base report search results to make sure everything is still properly aligned there.
Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 0c1fbffbe4f9af3e023e4a2fb9f26ec9f38507eb) Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
Johanna Raisa [Tue, 9 Aug 2022 08:58:59 +0000 (11:58 +0300)]
Bug 31326: Koha::Biblio->get_components_query fetches too many component parts
This patch adds double quotes to rcn and cni when searching component parts
with get_components_query.
Test plan:
1) Apply the patch
2) prove Koha/t/db_dependent/Koha/Biblio.t
Sponsored-by: Koha-Suomi Oy Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit a813de5f85c221974b2187259e25150ca7f44534) Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
Nick Clemens [Fri, 16 Dec 2022 13:14:51 +0000 (13:14 +0000)]
Bug 20473: Whitespace
Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 5249a0c1f0b9d498b3a2b6fcc55c6ef310b6e156) Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
Nick Clemens [Fri, 16 Dec 2022 13:12:19 +0000 (13:12 +0000)]
Bug 20473: Don't display 'Item information' tab when adding to basket from a file and not creating items
This patch adds a conditional, and moves another up one level to remove the tab
when it will have no content/effect
To test:
1. Stage a MARC file from Tools > Stage MARC records for import
2. Go to Acquisitions and create a basket for a vendor
3. Add to basket from staged file
4. Note that the "item information" tab is present, if you click on it, not that it is not useful
5. Cancel adding to basket
6. Apply patch
7. Add to basket from the staged file again
8. Confirm there is no item information tab
9. Confirm orders are added on 'Save'
Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit dcd6f549d94717367ff9b2bae22f078810f35785) Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 353edc0bba92a53b027389a20765d6b58a0e3a7c) Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
Katrin Fischer [Sat, 7 Jan 2023 02:11:48 +0000 (02:11 +0000)]
Bug 32588: Make filters on 'items with no checkouts' report translatable
This makes the filters on top of the 'items with no checkouts' report
translatable. The descriptions of the filters used the wrong terms and
were also pulled from the .pl file, making them untranslatable.
To test:
* Without patch: Run the 'items with no checkouts' report with various
settigs.
* Verify, that the display on top doesn't use standard terminology
Doc type = item type, Branch = library
* Apply patch
* Verify display is improved and standard terminology is used
If you know how to, you can also confirm strings show up nicely in
translations:
https://wiki.koha-community.org/wiki/Translating_Koha#Updating_the_po_files_in_your_installation
Signed-off-by: Frédéric Demians <f.demians@tamil.fr> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 74f2b832558d575b4d4825518a848fe2ef92f278) Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
Katrin Fischer [Thu, 26 Jan 2023 21:46:51 +0000 (21:46 +0000)]
Bug 26628: Fix access to clubs when user only has clubs permission
If a user only has the clubs and no permission from the tools section,
they can't access the patron clubs page by navigation. This patch
extends the permission checks for tools to include the clubs, that
live on the tools page, but have a top level permission.
To test:
- create a patron with only the catalogue and clubs permissions
- log in to the staff client as that patron
- navigate to a patron record, confirm you can see the Clubs tab in the patron account, can add patrons to and remove patrons from clubs
- confirm you don't have a link to the Tools module either on the Koha homepage or in the More menu
- enter the clubs URL manually (/cgi-bin/koha/clubs/clubs.pl), confirm you are allowed to open the page
- Apply patch
- The only changes should be:
- You can now see the Tools entry in the More navigation menu
- You can now see the Tools module link on the start page
- Both take you to the tools page, only visible tools is 'Patron clubs'
Signed-off-by: Andrew Fuerste-Henry <andrewfh@dubcolib.org> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 50927bb9b530f7a9c092dfe99bd2dddc69202432) Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
Katrin Fischer [Sat, 7 Jan 2023 01:34:24 +0000 (01:34 +0000)]
Bug 32589: Improve headings on result tables for 'Items with no checkouts'
When no filter was selected on the search form, the heading on
the results table showed as NULL. When library or item type were
selected the codes instead of the descriptions showed.
To test:
* Without patch:
* Run the 'items with no checkouts' report with different settings
for 'By:'. Verify the headings on the tables are not nice.
* Apply patch
* Rerun reports
* Headings should be "Ungrouped, item type or library descriptions
* Summary table also shows item type and library descriptions
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
→ OK. Would be nice to have decoding also in 'Filtered on' top section Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 37302e71fc7fab6dece6914a5438044bd1e8a14c) Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
Katrin Fischer [Sat, 7 Jan 2023 01:31:34 +0000 (01:31 +0000)]
Bug 32587: Add page-section to 'items with no checkouts' report
This adds page sections to the summary and result tables
for the 'items with no checkouts' report.
To test:
* Run the 'item with no checkouts' report with different settings
* Confirm result tables are missing the white brackground from
page-section
* Apply patch
* Confirm the result tables now do have the white background
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
→ Confirm both problem and solution Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit bb9db8fcfa7fb587d16fc0e553f94087c1b2962e) Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
Katrin Fischer [Sat, 7 Jan 2023 00:25:40 +0000 (00:25 +0000)]
Bug 32586: Reindent items with no checkouts report template
The indentation in the template was off and also full of tab
characters, so this does some clean-up prior to doing some
other small changes on separate bugs.
To test:
* Run the 'Items with no checkouts' report in the report module
* Note: If you get an error in this step, you need to turn of
sql_strict_mode in your koha-conf.xml, but this bug is out
of scope here.
* Apply patch
* Rerun the report, it should appear unchanged
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
→ Nice to the eyes, and no regression Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit a2444c546ea09199b86ad122c4787f1d45b9bf78) Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
This patch does a perltidy on the data structure, but also organizes
keys alphabetically to ease maintenance.
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 3a3afb84abfe715c198fb6e0ad20e8e0ad847626) Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
Katrin Fischer [Mon, 21 Nov 2022 22:31:24 +0000 (22:31 +0000)]
Bug 32292: Fix POD
POD had a typo in suggestions and was missing the new aqorders.
Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit a638f16d06ceb0e2bf924aa4ea8f16cffa867b70) Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
Katrin Fischer [Mon, 21 Nov 2022 22:15:15 +0000 (22:15 +0000)]
Bug 32292: Add missing column descriptions to borrowers table
Adds missing column descriptions for new features etc. to the
existing entry for borrowres columns descriptions.
To test:
* Go to reports > Guided reports
* Select patrons module
* Make sure all entries for the tables items and suggestions show
up with nice descriptions
Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit ea660f0c4b17a6ccce0d4a5b33b43f033ddd8ca9) Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
Katrin Fischer [Mon, 21 Nov 2022 21:49:43 +0000 (21:49 +0000)]
Bug 32292: Add column descriptions to biblio table
This adds nice descriptions to the aqorders database columns.
To test:
* Go to Guided reports
* Start a new report for acquisitions module
* Verify that all aqorders columns show with nice descriptions
None should be missing.
Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit ef7634ba9217707acf1584e6896bf8ed5daa3317) Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
Katrin Fischer [Mon, 21 Nov 2022 21:40:54 +0000 (21:40 +0000)]
Bug 32292: Add column descriptions to aqorders table
This adds nice descriptions to the aqorders database columns.
To test:
* Go to Guided reports
* Start a new report for acquisitions module
* Verify that all aqorders columns show with nice descriptions
None should be missing.
Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit a07ee68f4318a1ebda6df69e002f22fa378185a2) Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
* Adds proper labels to the database columns for suggestions
* Adds missing item columns:
* coded_location_qualifier
* deleted_on
* exclude_form_local_holds_priority
* Fixes spelling of item type, Uniform resource identifier
To test:
* Go to reports > Guided reports
* Select acquisition or another module using the items
* Make sure all entries for the tables items up with nice descriptions
* Changes to subscriptions: verify reading the patch, these don't seem to show
up yet in guided reports.
Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit c742247e68817d6cff62e348d291f9c40e5a341a) Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
Katrin Fischer [Fri, 6 Jan 2023 21:04:54 +0000 (21:04 +0000)]
Bug 31962: Add tooltip to 'configure' on datatable controls
This makes sure that the last button on the datatable controls
also has a tooltip, like the other buttons.
To test:
* Without the patch:
* Check out an item and look at the table of checkouts
* Look at the detail page of a record with at least one item
* Confirm that the 'configure' button doesn't have a tooltip appear
as a bubble like the other buttons
* Apply patch
* Restart_all and reload pages
* Make sure the styling of the 'configure' tooltip now matches that
of the other buttons
Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 12ae2c59e7ba322ad2cce47c37138f374507b628) Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
Katrin Fischer [Fri, 20 Jan 2023 15:49:09 +0000 (15:49 +0000)]
Bug 32689: Add missing space between 773$i label text and content
When 777 Ind. 2 = 8, $i will be used as the label. In this case,
we were missing a space between the $i and the other subfields.
This patch makes sure there is a space.
Note: the colon is expected to be part of the data here.
To test:
* Update default framework to display 773 a t w i by default in the editor,
OPAC and staff interface.
* Search for a record in the staff interface
* Click New > Add child record from the detail page
* Enter 245 and any mandatory fields
* Add $i to 773 entry and make the indicators: 0 8
* On the detail page and the result lists,
$i will be used a label, but there'll be no space between
label and content.
Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit d29057b38262e093d22b47faafeff71da858d408) Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
Jonathan Druart [Thu, 1 Feb 2018 17:32:54 +0000 (14:32 -0300)]
Bug 19188: Use the Price template plugin with_symbol => 1
To make it displayed correctly depending on the configuration of the
currency
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit c6366c6d6869be719e48e73b40827efd574a13c6) Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
Jenny Way [Tue, 16 Jan 2018 22:05:39 +0000 (22:05 +0000)]
Bug 19188: Self checkout missing currency symbol
Test plan:
1. Under administration and system preferences, enable WebBasedSelfCheck
2. In OPAC give user fine by going to 'my account' at top right
3. Then under fines tab 'create manual invoice'
4. Make sure this amount is more than noissuescharge which can be
changed under system preferences
5. Go to the web based self check from the OPAC URL
6. Log in as your user
7. Try to check out an item
7. Error 'Item cannot be checked out' should occur
8. With the patch, the currency symbol should show for the amount.
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 5eab08cc2edd897f9afdfeb46caf5e409476946f) Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
Lucas Gass [Wed, 4 Jan 2023 23:03:42 +0000 (23:03 +0000)]
Bug 32570: Display patron.state correctly
To test:
1. Have a patron with both a city and state in their Main address.
2. Do a patron search that will return that patron among others.
3. Notice the patroncity will say something like Centerville, Centerville: repeating the city but no state.
4. Apply patch
5. Try step 2 again, this time the city, state should display correctly.
Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 5acc976dec573ddd679219a0e920871a10622ac3) Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
Owen Leonard [Fri, 16 Dec 2022 12:23:10 +0000 (12:23 +0000)]
Bug 32482: (follow-up) Add markup comments
This patch adds comments to the template to highlight the markup
structure.
This patch should have no effect on the page's appearance or
functionality.
Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 06960c91e4f3359c349d0c694d173d4362956e97) Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
This patch reindents the holds awaiting pickup template so that it has
consistent indentation.
This patch also corrects a markup error that was causing a layout issue.
Incorrectly closed <div>s caused the circulation sidebar menu to
disappear.
To test, apply the patch and test all aspects of the page, including:
- Correctly functioning tabs and DataTables
- Cancel selected holds waiting
- Cancel selected holds waiting past ReservesMaxPickUpDelay
- Cancel all holds waiting past ReservesMaxPickUpDelay
- Cancel individual holds with cancellation requests (Cancellations
of waiting holds via the OPAC. See "Default waiting hold cancellation
policy" in Circulation and Fine rules).
Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 1e49a9fa855503d519c4c9eaa725e9933358b5d4) Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
Jonathan Druart [Wed, 14 Dec 2022 07:42:03 +0000 (08:42 +0100)]
Bug 32442: (bug 28739 follow-up) Ensure txn is rollbacked
If the TT process call is returning false and so the croak is raised,
then the txn is not rollbacked and the txn is not commited either.
We need to ensure the txn will be correctly rollbacked.
Test plan:
1. Go to any notice and create some invalid Template Toolkit:
[% IF ( 1 == 1 %]
test
[% END %]
2. Save and continue
3. Logout of Koha and attempt to log back in
=> Without this patch you got
Transaction aborted: DBIx::Class::Storage::DBI::mysql::_exec_svp_release(): DBI Exception: DBD::mysql::db do failed: SAVEPOINT savepoint_4 does not exist at /kohadevbox/koha/Koha/Object.pm line 170
. Rollback failed: DBIx::Class::Storage::DBI::mysql::_exec_svp_rollback(): DBI Exception: DBD::mysql::db do failed: SAVEPOINT savepoint_3 does not exist at /kohadevbox/koha/Koha/Patron.pm line 363 at /kohadevbox/koha/Koha/Patron.pm line 363
at /usr/share/perl5/DBIx/Class/Exception.pm line 77
=> With this patch applied the login works successfully
QA Note: The test is not testing that the txn is rolledback, I didn't
manage to test that.
Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 494a63f9e81c2255de162ec5daad1fb2f28dc67b) Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
Jonathan Druart [Wed, 14 Dec 2022 07:31:01 +0000 (08:31 +0100)]
Bug 32442: Add tests
Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 6d07a1cd8cc3137a4854ac1c2d3524258287f058) Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
Owen Leonard [Fri, 20 Jan 2023 17:08:19 +0000 (17:08 +0000)]
Bug 32690: (follow-up) Add markup comments
This patch adds comments to the template to highlight the markup
structure.
This patch should have no effect on the page's appearance or
functionality.
Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 06ff7cfc206dfc46021149f508e6e69ded417459) Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
Owen Leonard [Fri, 20 Jan 2023 16:59:42 +0000 (16:59 +0000)]
Bug 32690: Reindent the serial collection template
This patch reindents the serial collection template so that it has
consistent indentation. These changes should have no visible effect on
the page.
To test, apply the patch and go to Serials -> Subscription detail ->
Serial collection. Everything should look normal. All tabs should work
correctly.
Viewing the diff while ignoring whitespace changes should show only
places where a line break was added.
Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit bcf4ff277e892595ca96a85c699e51ac08dbab6b) Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
Slava Shishkin [Wed, 21 Dec 2022 12:46:45 +0000 (14:46 +0200)]
Bug 32504: Fix misalignment of visibility of basket orders table columns and missing export columns
To reproduce:
1. Go to /cgi-bin/koha/admin/columns_settings.pl
2. In the section Acquisition > Basket > Orders uncheck all checkboxes in the table settings
3. Go to a separate browser window to /cgi-bin/koha/acqui/booksellers.pl and open/create a new basket and add one book to it so the basket table will have rows in the "Order" table which we will configure below:
4. Click on the ["Columns" settings] for the table.
5. In the dropdown menu, observe that all Columns are marked as visible and correspond to the current table display.
6. Also check the export table feature: Click on "Export" and choose print, you will see that Columns up to GST (goods_and_services_tax) are displayed, and Fund and Estimated delivery date are missing.
7. Go back to table settings (like it was in steps.1-2)
8. Make the estimated_delivery_date column 'invisible by default' by checking out the appropriate checkbox and saving the changes.
9. Refresh the basket window/page (like in step 3).
10. Observe that in the table the whole columns "Estimated delivery date" is visible but "Fund" is gone.
11. Click on the ["Columns" settings] for the table.
12. In the dropdown menu observe that the wrong column is disabled ("Fund" instead of "Estimated delivery date").
13. Apply the patch.
14. Go through steps 3-12 and make sure that everything mentioned in those steps now works correctly: when you hide any columns in columns_settings.pl they are correctly hidden for the "Order" table, as well when exporting the table, the Fund, and Estimated delivery date columns are now exported.
Note: this patch also respects Koha.Preference('EDIFACT') setting and when it's enabled it also correctly hides/shows and exports the 'supplier_report' column.
Signed-off-by: Laura Escamilla <laura.escamilla@bywatersolutions.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 024cdf269ae8527d02c15e442af69a3ccda6e551) Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
Slava Shishkin [Tue, 20 Dec 2022 14:49:57 +0000 (16:49 +0200)]
Bug 32504: Fix typo columnname in columns_settings.yml
Trivial fix.
To reproduce:
1. Go to /cgi-bin/koha/admin/columns_settings.pl
2. Observe in the section Acquisition > Basket > Orders an empty field in the Column name, the row between fund and supplier_report rows: it was expected estimated_delivery_date value.
3. Apply the patch.
4. Restart Memcached (console: service memcached restart)
5. Reload cgi-bin/koha/admin/columns_settings.pl: that empty row now will have estimated_delivery_date value.
Signed-off-by: Laura Escamilla <laura.escamilla@bywatersolutions.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 9157a7e6db77ba20f7d686a67c4de6e9e27b1567) Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
Bug 32644: Terminology: staff/intranet and biblio in plugins-home page
This patch replaces some incorrect terminology in the plugins-home page.
The current terminology is available at https://wiki.koha-community.org/wiki/Terminology
To test:
0. Make sure you have no enhanced content plugins installed
1. Apply patch
2. Go to Administration > Manage plugins
3. Click 'View plugins by class'
--> Notice that one of the options is 'View bibliographic record enhancement
plugins for the staff interface'
4. Make sure this phrase is gramatically correct, makes sense and has no
typos
5. Click on that option
--> Notice that the message says 'No plugins that can enhance the bibliographic
records in the staff interface are installed'
6. Make sure this phrase is gramatically correct, makes sense and has no
typos
Signed-off-by: Andrew Fuerste-Henry <andrewfh@dubcolib.org> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 0fe829e5b2a67a8af2b026af02dcb23ec55af195) Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
This patch adds a .page-section container to two areas in the patron
homebound template.
This patch contains indentation changes, so please ignore whitespace
when looking at the diff.
To test, apply the patch and make sure the HouseboundModule system
preference is enabled.
- Locate a patron and edit their record.
- In the "Housebound roles" section, check both "Chooser" and
"Deliverer."
- Locate another patron and click on the "Housebound" menu item in the
left-hand sidebar.
- On the "Manage housebound profile" page, set a delivery day and
frequency and save changes.
- On the "Housebound details for..." page the details section at the top
should be correctly styled.
- Click "Add a new delivery."
- Fill out some delivery details and click "Save."
- Now the "Housebound details for..." page should show a "Deliveries"
section which is correctly styled.
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 5a0dbb3cd70660e1d66ab60ac732223e3d6c6cdb) Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
Owen Leonard [Fri, 27 Jan 2023 15:05:30 +0000 (15:05 +0000)]
Bug 32738: Correct upload local cover image title tag
This patch corrects the local cover image template's title tag so that
it conforms to the changes made in Bug 26703, 'Modify the "title"
elements to contain unique information first.'
The patch also makes minor corrections to the page's breadcrumbs.
To test you must have the LocalCoverImages system preference enabled.
- Apply the patch and go to Cataloging -> Upload local cover image.
- The page title should be correct:
Upload local cover image › Cataloging › Koha
- The breadcrumbs should be:
Home -> Cataloging -> Upload cover image
- Locate a bibliographic record and view its details.
- Click the "Images" tab, then the "Upload" button.
- The page title should now be
Upload local cover image for [title] › Cataloging › Koha
- The breadcrumbs should now be:
Home -> Cataloging -> Upload local cover image -> Upload cover for
[title]
Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 890231e7e65f0be00e153111b92ac77dbf0f6d16) Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
Owen Leonard [Thu, 12 Jan 2023 18:00:56 +0000 (18:00 +0000)]
Bug 32618: Add 'page-section' to various administration pages
This patch adds a "page-section" container div around the main section
of administration pages which lack it.
The SMS providers page required a small change to the associated
JavaScript in order to target the right container, so you may need to
clear your browser cache to get the correct behavior.
This patch contains indentation changes, so please ignore whitespace
when looking at the diff.
To test, apply the patch and view the following pages to confirm that
the main content is contained in a white box:
- Acquisitions -> Vendor -> Contracts
- Administration -> Budgets -> Budget details -> Planning
- Administration -> Circulation desks
- Administration -> OAI sets configuration -> Define mappings
- Administration -> System preferences -> Search for
'OverDriveAuthName' -> OverDrive library authnames table
- Administration -> SMS cellular providers
- Confirm that the "Edit" buttons work correctly to show and hide the
right content.
Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 2addd2879a0dc84775e594c354e2d7d4897b7df1) Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
Lucas Gass [Mon, 19 Dec 2022 23:50:17 +0000 (23:50 +0000)]
Bug 32382: (follow-up) Fix selector
Signed-off-by: Andrew Fuerste-Henry <andrewfh@dubcolib.org> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit ac1ab8ab451c3dfb76462e7a72273e009aef8be3) Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
Lucas Gass [Fri, 2 Dec 2022 00:18:59 +0000 (00:18 +0000)]
Bug 32382: Fix alignment on invoice summary page
To test:
1. Apply patch
2. Have some funds from budgets that are both active and inactive
3. Receive a basket and click 'Finish receiving' to get to the invoice page
4. Look at the Fund/Show inactive line and make sure it is aligned right
5. With some inactive funds click 'Show inactive' and make sure they appear in this dropdown
6. Click 'Add an adjustment'. Make sure the Fund/Show inactive line looks correct there as well/
7. Make an adjustment and click 'Update adjustments' make sure the line also looks right in the table that appears.
8. Inside that table make sure you can click the 'Show inactive' checkbox and the inactive budgets appears.
Note: Some of the HTML was ouside of the HTML body, so I moved it into the HTML body so it will be valid.
Signed-off-by: Andrew Fuerste-Henry <andrewfh@dubcolib.org> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit d66d118b4305f25dea432db490234763330aafc2) Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 320d184bb1e1f0fb66fec45fb035d7049fd6e808) Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
Bug 32712: Fix OPAC breakage when OPACShowCheckoutName enabled
Bug 31313 removed GetItemsInfo and proper Koha::Object-based objects are
passed now. But some automatic search & replace kept patron-related
attributes incorrectly linked to Koha::Item.
This patch makes the item-status.inc file reuse the checkout object and
get the linked patron to gather the required information. Some
simplification is done on hte same patch... should be trivial.
To test:
1. Have OpacShowCheckoutName enabled
2. Pick a biblio with items (all of them not checkecd-out)
3. Open the OPAC detail view for the biblio
=> SUCCESS: You see the biblio and the items
4. Check one of the items out
5. Refresh the OPAC page
=> FAIL: The page explodes!
6. Apply this patch
7. Refresh the OPAC page
=> SUCCESS: You see the biblio and the items, the patron info is
correctly displayed.
8. Sign off :-D
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> Signed-off-by: Lucas Gass <lucas@bywatersolutions.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit d74fe69d2c463078ba4c0797cdc3d01fab82bccb) Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
To test:
1. Create a serial subscription
1.1. Go to Serials
1.2. Click on New subscription
1.3. Fill out the first form
- Vendor: leave empty
- Record: enter a record number (I used 108)
- Create an item record when receiving this serial
- When there is an irregular issue: Keep issue number
- Manual history: leave unchecked
- Call number: leave empty
- Library: Centerville
- Public/nonpublic note: leave empty
- Patron notification: None
- Location: None
- Collection: None
- Item type: Continuing resources
- Grace period: leave empty
- Number of issues to display: leave both empty
1.4. Click Next (and confirm you are not using a vendor)
1.5. Fill out the second form
- First issue publication date: 2023-01-01
- Frequency: 1/month
- Subscription length: issues 12
- Subscription start date: 2023-01-01
- Subscription end date: 2024-01-01
- Numbering pattern: Number
- Locale: leave empty
- Begins with: 42
- Inner counter: leave empty
1.6. Click Test prediction pattern
1.7. Click Save subscription
2. Click OPAC view: Open in new window.
=> SUCCESS: It should open normally in another tab/window and the record displays without problem
3. Back in the staff interface tab, receive an issue
3.1. Click Receive
3.2. In Status, choose Arrived for No. 42
3.3. Click Save
4. Go back to the OPAC tab and refresh
=> FAIL: Page explodes
5. Apply this patch
6. Repeat 4
=> SUCCESS: Information shows correctly no explosions.
7. Sign off :-D
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> Signed-off-by: Caroline Cyr La Rose <caroline.cyr-la-rose@inlibro.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 8f38f3b74ba8c16d1b6da76714371312f6a8037e) Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
Katrin Fischer [Fri, 20 Jan 2023 15:29:49 +0000 (16:29 +0100)]
Bug 16522: Move 773 entries in result lists before 856 entries
This moves the display of 773 In: displays to right before the
856 Online resource: as suggested by Heather in order to make it
more consistent with the display in the detail pages.
Everything should be unchanged, but the position of the
In: line :)
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 64d3612dd9c374a18b6aadbd26dc6e7d4be0309a) Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
Aleisha Amohia [Mon, 17 Oct 2022 22:38:44 +0000 (22:38 +0000)]
Bug 16522: (follow-up) If no 773$w, try to return host record
Use host biblionumber or host itemnumber to return a host record if
EasyAnalyticalRecords is enabled, or return an undef record and a string
of host information when get_marc_host is called in list context.
Signed-off-by: Heather Hernandez <heather_hernandez@nps.gov> Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 5e226c1a63f916e0224d9fcbaa6e5beaf8f5b44c) Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
Katrin Fischer [Wed, 28 Sep 2022 14:11:45 +0000 (14:11 +0000)]
Bug 16522: (follow-up) Remove HTML links from email
The emails sent for cart and list are plain text and any
<a> tag will be scrubbed by HtmlToText. So we can remove
those links.
This also solves an issue with the original patch set,
where the error below would appear on sending a cart or
list email from the staff interface:
Template process failed: file error - biblio_a_href: not found at /kohadevbox/koha/C4/Templates.pm line 127
Signed-off-by: Heather Hernandez <heather_hernandez@nps.gov> Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 48aa83a3cabc52804089199d24ea158e2586b129) Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
Katrin Fischer [Wed, 28 Sep 2022 13:00:25 +0000 (13:00 +0000)]
Bug 16522: (follow-up) Fix variable in OPAC cart brief display
Without this change records 773 entries with links in $w would
not display the title information, but just "No title".
With the variable fixed, now the host's title displays.
Signed-off-by: Heather Hernandez <heather_hernandez@nps.gov> Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 980682bb9673b4dd2afd50b678c267d9e38774e1) Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
Katrin Fischer [Wed, 28 Sep 2022 12:50:45 +0000 (12:50 +0000)]
Bug 16522: (follow-up) Rename "Host item entry" to "In"
We already use In: as label for 773 on the result lists and
detail pages and it's also recommended in the MARC documentation.
With this patch the label is the same everywhere.
Signed-off-by: Heather Hernandez <heather_hernandez@nps.gov> Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit ec48907e23441648233eac2167ad4a1759b4c765) Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
Katrin Fischer [Fri, 26 Aug 2022 16:57:19 +0000 (16:57 +0000)]
Bug 16522: (follow-up) Add missing TT filters
Signed-off-by: Heather Hernandez <heather_hernandez@nps.gov> Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 2eeeeeb06a2f457527a9022e2a688e8b08d645c6) Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
projects / koha.git / log