]> git.koha-community.org Git - koha.git/log
koha.git
20 months agoBug 30993: (QA follow-up) Add missing filter
Tomas Cohen Arazi [Wed, 15 Feb 2023 12:27:50 +0000 (09:27 -0300)]
Bug 30993: (QA follow-up) Add missing filter

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 2697f7884bbb1c68e09f47a5260b4c801f30bfe2)
Signed-off-by: Pedro Amorim <pedro.amorim@ptfs-europe.com>
20 months agoBug 32908: Load item type icons from the correct path
George Veranis [Wed, 8 Feb 2023 12:21:39 +0000 (13:21 +0100)]
Bug 32908: Load item type icons from the correct path

In the Staff interface, the details page of a bibliographic
record should display the icon associated with the item
type of an item ('Item type' column in the 'Holdings' tab).

This feature broke in v22.11.00 (for Debian package installs):
instead of the item type icon you get the default 'broken
image URL' image of your web browser.

This patch fixes that.

Test plan:

1) (if needed) Configure the following System preferences:
   - item-level_itypes => 'specific item'
   - noItemTypeImages  => 'Show'

2) (if needed) In Koha Administration > Item types, create
   an item type and associate it with an icon

3) (if needed) Create a test bibliographic record, and add
   an item to it that has an item type with an icon

4) Visit the bibliographic record's details page in the
   Staff interface. Notice that in the 'Item type' column of
   the 'Holdings' tab instead of seeing the icon associated
   with the item type of each item you get the default
   'broken image URL' image of your web browser [*].

   [*] In non-Debian package installs, the 'href' property
       of the item type icon's <img> tag should start with
       '/opac-tmpl/bootstrap/itemtypeimg'

5) Apply this patch, and refresh the page with CTRL-F5.
   The item type icon should now be displayed correctly.

   [*] KTD and Koha Sandboxes users: To verify the patch
       has worked, you should right-click on the item type
       icon and click 'Inspect: the 'href' property of the
       <img> tag should now start with:
       '/intranet-tmpl/prog/img/itemtypeimg'

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 bc9a37534f10a13ca9513fae31d094e322e5358b)
Signed-off-by: Pedro Amorim <pedro.amorim@ptfs-europe.com>
20 months agoBug 22693: ILL "Price paid" column does not appear in column configuration
Jacob O'Mara [Mon, 9 Jan 2023 10:32:23 +0000 (10:32 +0000)]
Bug 22693: ILL "Price paid" column does not appear in column configuration

Test Plan:
 - Navigate to ILL requests page from the main menu after setting up your ILL backend.
 - Observe that Price Paid column does not exist either here nor in the column configuration.
 - Apply patch
 - Observe that Price Paid column now appears in ILL requests table and in the column configuration page.

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 c5abf57f5a2164e118eeac0e021038eb71df2644)
Signed-off-by: Pedro Amorim <pedro.amorim@ptfs-europe.com>
20 months agoBug 32605: (follow-up) Additional fixes
Owen Leonard [Fri, 3 Feb 2023 18:22:45 +0000 (18:22 +0000)]
Bug 32605: (follow-up) Additional fixes

This patch makes some further changes to form CSS in order to improve
consistency. Some templates have also been modified to improve layout.

- Acquisitions -> New vendor
- Staff interface home ->  Patrons requesting modifications
- Reports -> Saved SQL reports
- Serials -> New subscription
- Tools -> Import patrons

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 898aeaad9a095d1ebf5c64cee0ca2d16b57dfade)
Signed-off-by: Pedro Amorim <pedro.amorim@ptfs-europe.com>
20 months agoBug 32605: Restore some form styling from before the redesign
Owen Leonard [Tue, 10 Jan 2023 15:54:09 +0000 (15:54 +0000)]
Bug 32605: Restore some form styling from before the redesign

This patch pulls styles from pre-22.11 staff-global.scss related to the
styling of fieldset.rows and contents. The old CSS is more verbose but
it has been better proven to hold up in a variety of situations.

The patch makes only one template change, a minor correction to the
basket groups form.

To test, apply the patch and rebuild the staff interface SCSS.

Test as many forms as possible to confirm that everything is still
correct. Forms affected are ones shown in the main body of the page, not
in sidebars.

Some good examples: Editing patrons, subscriptions, patron categories,
notices, item types.

This patch should help outstanding bugs 32513, 32543, and 32591

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 0a3eee9e70988625c6d1ce3f044d9a540e2ebe5c)
Signed-off-by: Pedro Amorim <pedro.amorim@ptfs-europe.com>
20 months agoBug 32909: Load item type icons from the correct path
Andreas Roussos [Wed, 8 Feb 2023 14:07:52 +0000 (15:07 +0100)]
Bug 32909: Load item type icons from the correct path

When placing an item-level hold in the Staff interface,
the table at the bottom of the screen (under the "Place
a hold on a specific item" heading) should display the
icon associated with the item type of each item in the
'Item type' column.

This feature broke in v22.05.00 (for Debian package installs):
instead of the item type icon you get the default 'broken
image URL' image of your web browser.

This patch fixes that.

Test plan:

1) (if needed) Configure the following System preferences:
   - item-level_itypes => 'specific item'
   - noItemTypeImages  => 'Show'

2) (if needed) In Koha Administration > Item types, create
   an item type and associate it with an icon

3) (if needed) Create a test bibliographic record, and add
   an item to it that has an item type with an icon

4) Visit the bibliographic record's details page in the
   Staff interface. Select 'Holds' on the left hand side,
   then pick a patron. The "Place a hold on ..." page should
   load. In the 'Item type' column of the table at the bottom
   of the screen notice that instead of seeing the icon
   associated with the item type of each item you get the
   default 'broken image URL' image of your web browser [*]

   [*] In non-Debian package installs, the 'href' property
       of the item type icon's <img> tag should start with
       '/opac-tmpl/bootstrap/itemtypeimg'

5) Apply this patch, restart Plack and refresh the page.
   The item type icon should now be displayed correctly.

   KTD and Koha Sandboxes users: To verify the patch has
   worked, you should right-click on the item type icon and
   click 'Inspect': the 'href' property of the <img> tag
   should now start with: '/intranet-tmpl/prog/img/itemtypeimg'

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit ed84cfd43b0d7c135d96b712713787cf7fd53834)
Signed-off-by: Pedro Amorim <pedro.amorim@ptfs-europe.com>
20 months agoBug 30993: Improve translatabilty of UPLOAD av hint
Katrin Fischer [Fri, 6 Jan 2023 23:06:52 +0000 (23:06 +0000)]
Bug 30993: Improve translatabilty of UPLOAD av hint

Improve translatability on the hint for AV UPLOAD
on the upload tool page.

To test:
* Go to tools > uploads
* Verify that the hint below the 'Browse...' displayes nicely
  and the link to the UPLOAD AV works correctly
* Apply patch
* Verify the link still works and the sentence reads correctly.
  NOTE: now only UPLOAD will be linked.

If you are familiar with the process, you can also make sure
the strings now show up on po files as expected:
https://wiki.koha-community.org/wiki/Translating_Koha#Updating_the_po_files_in_your_installation

Signed-off-by: Caroline Cyr La Rose <caroline.cyr-la-rose@inlibro.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 453793f714367178a2642bfd3115bfc82556ebd0)
Signed-off-by: Pedro Amorim <pedro.amorim@ptfs-europe.com>
20 months agoBug 31957: (follow-up) Further improve translations
Katrin Fischer [Mon, 9 Jan 2023 20:00:53 +0000 (20:00 +0000)]
Bug 31957: (follow-up) Further improve translations

With the previous attempt, we ended up with some TT
constructs in the po files. This will hopefully avoid that.

Signed-off-by: Caroline Cyr La Rose <caroline.cyr-la-rose@inlibro.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit d2a281ad4b80fc74bfeaab8260408bb354f7a9b8)
Signed-off-by: Pedro Amorim <pedro.amorim@ptfs-europe.com>
20 months agoBug 31957: Improve translatability of text containing links on libraries admin page
Katrin Fischer [Fri, 6 Jan 2023 22:33:43 +0000 (22:33 +0000)]
Bug 31957: Improve translatability of text containing links on libraries admin page

The libraries administration page has several links to system
preferences that appear within sentences or with other text
around it. To make translations easier, we need to make sure that
those links don't break context.

To test:
* Activate IllModule (so we can see the ILL staff email setting)
* Go to administration > libraries
* Verify that the links for those settings show correctly
  * Reply-to
  * Return-Path
  * Ill staff email
  * MARC organization code
* Apply patch
* Verify links still work and show unchanged

If you are familiar with the process, you can also make sure
the strings now show up on po files as expected:
https://wiki.koha-community.org/wiki/Translating_Koha#Updating_the_po_files_in_your_installation

https://bugs.koha-community.org/show_bug.cgi?id=31954

Signed-off-by: Caroline Cyr La Rose <caroline.cyr-la-rose@inlibro.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 0e64ead240fd6df47a1a11e4e2439b1c9869da07)
Signed-off-by: Pedro Amorim <pedro.amorim@ptfs-europe.com>
20 months agoBug 30642: (RMaint follow-up) Fix db_revs name
Martin Renvoize [Tue, 14 Feb 2023 15:39:43 +0000 (15:39 +0000)]
Bug 30642: (RMaint follow-up) Fix db_revs name

We got our version numbering a bit muddled here.. fixed before anything
bad happened ;P

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
20 months agoBug 30642: (follow-up) Remove use of deleted file
Tomas Cohen Arazi [Tue, 14 Feb 2023 13:27:13 +0000 (10:27 -0300)]
Bug 30642: (follow-up) Remove use of deleted file

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 796b3559e58fa5fe0ff02078f76421198cf89093)
Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
20 months agoBug 30642: Fix dbrev permissions
Tomas Cohen Arazi [Tue, 14 Feb 2023 12:41:47 +0000 (09:41 -0300)]
Bug 30642: Fix dbrev permissions

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit a637666d3ec804eca7c9a15a6bcdd7cb387d91c5)
Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
21 months agoBug 30642: DBRev 22.12.00.004
Tomas Cohen Arazi [Fri, 10 Feb 2023 15:47:15 +0000 (12:47 -0300)]
Bug 30642: DBRev 22.12.00.004

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 178e40ae9fd7246fa638a64c34fde06f94548ff0)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
21 months agoBug 30642: Make renewal_type an enum in spec and add test
Tomas Cohen Arazi [Fri, 10 Feb 2023 12:35:01 +0000 (09:35 -0300)]
Bug 30642: Make renewal_type an enum in spec and add test

This patch makes the renewal_type an enum, to match the change on the
DB. A test is added to account the fact the API is always setting
'Manual' request type.

Bonus: small portion of code gets a tidy, should've been asked by QA.

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit c90f60adfcb3aeba3dd81122cce96db2c8d1fc1d)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
21 months agoBug 30642: (QA follow-up) Do not rely on script names in modules, add unit test
Kyle M Hall [Fri, 20 Jan 2023 14:57:21 +0000 (14:57 +0000)]
Bug 30642: (QA follow-up) Do not rely on script names in modules, add unit test

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Edit: Kyle, stop impersonating John Doe
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit e8c232fcf757659bfb48433e1b8f08fa895e6aaa)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
21 months agoBug 30642: (follow-up) Change sql and adapt for translations
Matt Blenkinsop [Thu, 8 Dec 2022 14:28:49 +0000 (14:28 +0000)]
Bug 30642: (follow-up) Change sql and adapt for translations

New column has now been changed to an enum in line with comments and the strings have been amended to be picked up for translation. The file koha-tmpl/intranet-tmpl/prog/en/includes/str/checkout_renewals.inc has been removed as the variables can be included within the javascript file.

Test plan:
1) In the database shell run "show columns from checkout_renewals;" and observe that there is currently no column for recording the type of renewal
2) Apply patch
3) In the shell run "dbic" and "perl installer/data/mysql/updatedatabase.pl" to update the database schema with the new column.
4) Create some checkouts
5) Renew some checkouts manually and observe in the database that there is now a column called "renewal_type" that will have recorded these as "Manual"
6) Create some checkouts that can be automatically renewed
7) Run the cron script in automatic_renewals.pl and observe that there are now also entries with a renewal_type of "Automatic"
8) Send a GET request to http://localhost:8081/api/v1/checkouts/1/renewals and observe that the renewal_type is now returned in the response
9) In the Item Details tab for a record, there is the "Current renewals" option which has a button to view renewals. Click on this and observe that the modal now displays the new information.

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 7fe9e76af85f3f063ac870d17b10c5e18f95c48f)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
21 months agoBug 30642: Record renewal type
Matt Blenkinsop [Tue, 6 Dec 2022 16:48:45 +0000 (16:48 +0000)]
Bug 30642: Record renewal type

A requirement has been requested to record whether a renewal was done manually or automatically. A column has been added to the checkout_renewals table in the database to record this and a check is now in place to determine whether the renewal was manual or automatic. The API has also been updated to reflect this new column and return the data when requested. The renewals modal view has also been updated to show what type the renewal was.

Test plan:
1) In the database shell run "show columns from checkout_renewals;" and observe that there is currently no column for recording the type of renewal
2) Apply patch
3) In the shell run "dbic" and "perl installer/data/mysql/updatedatabase.pl" to update the database schema with the new column.
4) Create some checkouts
5) Renew some checkouts manually and observe in the database that there is now a column called "renewal_type" that will have recorded these as "Manual"
6) Create some checkouts that can be automatically renewed
7) Run the cron script in automatic_renewals.pl and observe that there are now also entries with a renewal_type of "Automatic"
8) Send a GET request to http://localhost:8081/api/v1/checkouts/1/renewals and observe that the renewal_type is now returned in the response
9) In the Item Details tab for a record, there is the "Current renewals" option which has a button to view renewals. Click on this and observe that the modal now displays the new information.

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 5045da59f15a7dfb3da72b5f96e249976a84692b)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
21 months agoBug 28674: DBIC schema
Tomas Cohen Arazi [Fri, 10 Feb 2023 14:01:39 +0000 (11:01 -0300)]
Bug 28674: DBIC schema

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 60c0d42359cb91baac6dc871146671a17380cd4f)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
21 months agoBug 32125: Select correct tab on return
Martin Renvoize [Mon, 7 Nov 2022 16:44:29 +0000 (16:44 +0000)]
Bug 32125: Select correct tab on return

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
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 32258f82b5dd6a2bef3faedf06211eaf674f674c)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
21 months agoBug 32125: Impliment modal context return on opac-detail.
Martin Renvoize [Thu, 6 Oct 2022 13:41:19 +0000 (14:41 +0100)]
Bug 32125: Impliment modal context return on opac-detail.

This patch utilises the generic return option introduced in the previous
patch to prevent lose of context when clicking to login to add a comment
to a biblio.

Test plan
1/ Test that prior to this patch, upon clicking 'Log in to your account
to post a comment' you are redirected to opac-user.pl and thus loose
your context.
2/ Apply the patch
3/ Confirm that a login using the 'Log in to your account to post a
comment' link now redirect immediatly back the correct record and thus
maintains context.

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
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 93d563b575d3c0a43702e1bf7dda5afc211c898f)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
21 months agoBug 31699: (follow-up) Protect more against open redirects
David Cook [Thu, 10 Nov 2022 00:00:37 +0000 (00:00 +0000)]
Bug 31699: (follow-up) Protect more against open redirects

This change checks that the OPACBaseURL exists, and uses its scheme
and authority to rewrite the URL passed through the "return"
param.

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 37ced7df0531accb4f091c78258ff98946d062c9)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
21 months agoBug 31699: (follow-up) Protect against unauthorized redirects
Martin Renvoize [Wed, 9 Nov 2022 08:27:44 +0000 (08:27 +0000)]
Bug 31699: (follow-up) Protect against unauthorized redirects

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit e0760fd1851abc4a94a924bcf30e775c8e97da2a)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
21 months agoBug 31699: Add 'return' option to opac modal login
Martin Renvoize [Thu, 6 Oct 2022 13:38:42 +0000 (14:38 +0100)]
Bug 31699: Add 'return' option to opac modal login

This patch adds the option to trigger a redirect back to the current
context after successful login using modal logins triggered from various
places in the OPAC.

To make use of this, simply add 'data-return="true"' to the modal trigger link.

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
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 507d48413d3d09866a37db81d2a856f9a0a7c6f9)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
21 months agoBug 32539: Add tests
Jonathan Druart [Thu, 9 Feb 2023 10:45:02 +0000 (11:45 +0100)]
Bug 32539: Add tests

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 7bb4aeba9f10336d836f31b9e572390dd5bf588a)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
21 months agoBug 32539: Add exception handling to plugin hooks in template plugin
David Cook [Mon, 16 Jan 2023 04:41:01 +0000 (04:41 +0000)]
Bug 32539: Add exception handling to plugin hooks in template plugin

This change wraps Koha plugin hook calls with exception handling
within the template plugin for Koha plugins.

Test plan:
0) Apply patch
1) Install a plugin that provides "opac_head", "opac_js",
"intranet_head", and "intranet_js" with Perl errors in them
2) Load an OPAC page
3) Note that the OPAC page loads correctly
4) Load a staff interace page
5) Note that the staff interface page loads correctly

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 23a002112273d2b406af7edd6b85acce0d5d699c)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
21 months agoBug 32624: Don't include guarantee or guarantor fines in BV (fines amount) in SIP...
Nick Clemens [Fri, 13 Jan 2023 19:27:04 +0000 (19:27 +0000)]
Bug 32624: Don't include guarantee or guarantor fines in BV (fines amount) in SIP messages

This patch chanegs the code to report only the patron's personal fines, and to report a block
from other fines in the screen message

This is to prevent overpayment on accounts from SIP machines

To test:
1 - prove t/db_dependent/SIP/Patron.t

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 c6c2fe81a273cbb70af69dfa0b51b2f07b49a76c)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
21 months agoBug 31338: (follow-up) add special class and add also to OPAC
Fridolin Somers [Sat, 1 Oct 2022 04:53:47 +0000 (18:53 -1000)]
Bug 31338: (follow-up) add special class and add also to OPAC

In order to easily hide this new text, this patch adds the class "included-see-from-headings-info".

Also uses <div> instead of <p>.

And adds the same feature to OPAC.

Signed-off-by: Barbara Johnson <barbara.johnson@bedfordtx.gov>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 6acdfd0493a472232cc265d7b1cac8abcff94add)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
21 months agoBug 31338: Show in advanced search when IncludeSeeFromInSearches is used
Fridolin Somers [Wed, 10 Aug 2022 20:55:55 +0000 (10:55 -1000)]
Bug 31338: Show in advanced search when IncludeSeeFromInSearches is used

Test plan :
1) Apply patch
2) Set system preference IncludeSeeFromInSearches to "Include"
3) Go to staff interface advanced search
4) Check you see tip text in "Search for"
5) Set system preference IncludeSeeFromInSearches to "Don't include"
6) Go to staff interface advanced search
7) Check you don't see tip text in "Search for"

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
Signed-off-by: Barbara Johnson <barbara.johnson@bedfordtx.gov>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 8d9de60582a6de64160026b99256187d7f04ea1e)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
21 months agoBug 32769: Standardize structure around action fieldsets in administration
Owen Leonard [Tue, 31 Jan 2023 18:29:01 +0000 (18:29 +0000)]
Bug 32769: Standardize structure around action fieldsets in administration

This patch updates administration templates so that fieldsets with the
"action" class are placed outside the form's main fieldset.

To test, apply the patch and check the following pages to confirm that
the forms look correct:

- Administration
   -> Keyboard shortcuts
   -> Audio alerts
   -> Share content with Mana KB
      - When the ManaToken system preference is empty, the page should
        have two forms with updated fieldsets: the form with the "Use
        Mana KB..." field and a "Configure Mana KB" form.
      - With a ManaToken defined the second form should be one labeled
        "Mana KB token."
   -> Budgets
      - Click on a budget which has existing funds.
      - In the page toolbar click Planning -> Plan by libraries.
      - Check the forms in the sidebar.
   -> System preferences ->  OverDriveAuthName
      - Follow the link to "OverDrive library authnames table" and check
        the form on that page.

Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 622581e5bfd8c42082bba6ee8a54e3249ea78c5d)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
21 months agoBug 29173: (QA follow-up) Match pop-over sizes
Martin Renvoize [Wed, 8 Feb 2023 06:56:20 +0000 (06:56 +0000)]
Bug 29173: (QA follow-up) Match pop-over sizes

As suggested by David Nind, this patch updates the call to z3950 search
on the authority edit page to match the sizing of the one from the
details page.

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit d25b7459b4ff4fd9f6acd539ab547fcb57dac6e0)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
21 months agoBug 29173: Fixed pre-filling of the search form from the "Replace record with ZR39...
Thibaud Guillot [Tue, 29 Mar 2022 14:12:48 +0000 (16:12 +0200)]
Bug 29173: Fixed pre-filling of the search form from the "Replace record with ZR39.50/SRU" (Authority page detail)

Now this action has the same pre-filling behaviour as the "Edit" -> "Edit Record" -> "Replace Record via Z39.50/SRU Search" action.
Author Personal - Author Meeting/Conf. - Uniform Title and Subject are filled in if the subfield contains data (like the "Edit->Replace" action).
Unimarc and Marc21 specificities are supported.

Test Plan :

1) You must have a Z39.50/SRU server for authorities
2) Go to an authority detail page (Author - Uniform title - Subject)
3)After go to "Edit"-> "Edit record" -> "Replace record via..." or
choose "Replace Record.." directly
4) See that form is also prefilled with data now

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 26c26164ba78029cb99fa99662f9e0a8ce9557df)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
21 months agoBug 32356: Install installer translated files on update
Jonathan Druart [Tue, 29 Nov 2022 09:22:10 +0000 (10:22 +0100)]
Bug 32356: Install installer translated files on update

If the installer files exist for a given language, the translate script
won't update it.
We should get a confirmation from Bernardo (author of bug 24262), but I
don't understand why it could be needed (side-effects?)

Test plan:
Installer several times the same language, drop the DB and run the
installer+onboarding process.
Check files installed by the installer (yaml for notice templates,
biblio frameworks) have inserted the data properly in DB.

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomás Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit aa3444505f2b47a73f4b281a622b6c1073bb5c8d)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
21 months agoBug 32408: Add unit tests to SIP checkout
Matthias Meusburger [Thu, 8 Dec 2022 10:38:10 +0000 (10:38 +0000)]
Bug 32408: Add unit tests to SIP checkout

This patch adds unit tests to show SIP's behavior on checkout according to the
AllFinesNeedOverride, AllowFineOverride and noissuescharge sysprefs, knowingly:

+----------------------+-------------------+---------+---------+
| AllFinesNeedOverride | AllowFineOverride |  Under  |  Over   |
+----------------------+-------------------+---------+---------+
|                    0 |                 0 | allowed | blocked |
|                    0 |                 1 | allowed | blocked |
|                    1 |                 0 | blocked | blocked |
|                    1 |                 1 | blocked | blocked |
+----------------------+-------------------+---------+---------+

(the columns Under and Over are referring to "under noissuescharge" and
"over noissuescharge")

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 5f97fa18cc4dfc133f535815395b34f5cc7bfffa)
Signed-off-by: Pedro Amorim <pedro.amorim@ptfs-europe.com>
21 months agoBug 28672: (QA follow-up) Method calls cannot be interpolated directly
Kyle Hall [Wed, 1 Feb 2023 11:52:01 +0000 (06:52 -0500)]
Bug 28672: (QA follow-up) Method calls cannot be interpolated directly

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 8939c58a862c819e8af6366c664ec89fbe3f7547)
Signed-off-by: Pedro Amorim <pedro.amorim@ptfs-europe.com>
21 months agoBug 28672: Pass itemnumber instead of item object
Martin Renvoize [Wed, 7 Jul 2021 11:43:36 +0000 (12:43 +0100)]
Bug 28672: Pass itemnumber instead of item object

The warn call here was passing the full item object which leads to
HASH() in the logs.. this patch updates it to pass the itemnumber which
is more helpful.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit c89c25d81aa8d6a2500820b84aaf7a5c157ed815)
Signed-off-by: Pedro Amorim <pedro.amorim@ptfs-europe.com>
21 months agoBug 29100: (QA follow-up) Rename issue(s) keys to checkout(s)
Kyle Hall [Tue, 15 Nov 2022 11:57:44 +0000 (06:57 -0500)]
Bug 29100: (QA follow-up) Rename issue(s) keys to checkout(s)

Adapted test plan:

1) Apply this patch
2) For DUE and PREDUE notices, set the message body to the following:
   Title: [% checkout.title %]
3) For DUEDGST and PREDUEDGST notices, set the message body to the following:
   Titles:
   [% FOREACH c IN checkouts %]
    * [% c.title %][% END %]
4) Generate PREDUE and DUE notices for patrons including digests
5) Verify those notices contain the checkout titles

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Edit: tcohen renamed @issues => @checkouts as well
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Tomás Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit d81bca827058e04f656ce0bf95187b7b74b2d5c2)
Signed-off-by: Pedro Amorim <pedro.amorim@ptfs-europe.com>
21 months agoBug 29100: Remove unnecessary loops
Kyle Hall [Thu, 23 Sep 2021 17:40:48 +0000 (13:40 -0400)]
Bug 29100: Remove unnecessary loops

Remove loops that only operate one one result only

Signed-off-by: Felicity Brown <Felicity.Brown@montgomerycountymd.gov>
Signed-off-by: George Veranis <gveranis@dataly.gr>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit fd7a612c6ed4dc85049fa2ef6a786d2657501d74)
Signed-off-by: Pedro Amorim <pedro.amorim@ptfs-europe.com>
21 months agoBug 29100: Add checkouts data loop to predue notices script ( advance_notices.pl )
Kyle Hall [Thu, 23 Sep 2021 17:24:42 +0000 (13:24 -0400)]
Bug 29100: Add checkouts data loop to predue notices script ( advance_notices.pl )

Predue / due notices are limited to using itemscontent to display checkouts data. It would be nice to make all the checkouts data available for those notices so that libraries could format that data more nicely if they wish.

1) Apply this patch
2) For DUE and PREDUE notices, set the message body to the following:
Title: [% issue.title %]
3) For DUEDGST and PREDUEDGST notices, set the message body to the following:
Titles:
[% FOREACH i IN issues %]
* [% i.title %]
[% END %]
4) Generate PREDUE and DUE notices for patrons including digests
5) Verify those notices contain the checkout titles

Signed-off-by: Felicity Brown <Felicity.Brown@montgomerycountymd.gov>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 2114c70d11b077d83db4bdf9f3e85598e96cf2cb)
Signed-off-by: Pedro Amorim <pedro.amorim@ptfs-europe.com>
21 months agoBug 32788: Order curbside pickup slots chronologically
Jonathan Druart [Mon, 6 Feb 2023 16:03:32 +0000 (17:03 +0100)]
Bug 32788: Order curbside pickup slots chronologically

We need to order the slots chronologically, not depending on when they
have been added.

Test plan:
Create a slot 13 to 17 the another one 8 to 12
We want to display 8 to 12 before 13 to 17.
Confirm that this patch fixes that on the 3 following views:
Curbside pickups admin
Curbside pickups staff side
Curbside pickups at the OPAC

Signed-off-by: Caroline Cyr La Rose <caroline.cyr-la-rose@inlibro.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 0481f1d74e7d6175e1eb31b299f01c7cc7ce6090)
Signed-off-by: Pedro Amorim <pedro.amorim@ptfs-europe.com>
21 months agoBug 32743: (follow-up) Add markup comments
Owen Leonard [Mon, 30 Jan 2023 12:28:03 +0000 (12:28 +0000)]
Bug 32743: (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: 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 ac1e80400d3ab21001a5c0259a09280a7ab1cbfe)
Signed-off-by: Pedro Amorim <pedro.amorim@ptfs-europe.com>
21 months agoBug 32743: Reindent the invoice details page
Owen Leonard [Mon, 30 Jan 2023 11:55:56 +0000 (11:55 +0000)]
Bug 32743: Reindent the invoice details page

This patch reindents the invoice 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 Acquisitions -> Invoices.

- Perform a search which will return invoice results.
- Click on an invoice to view the details.
- Everything should look normal.

Viewing the diff while ignoring whitespace changes should show only
places where a line break was added.

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 bf5806e2ec353d5c873f1d8f08f8eb910f752975)
Signed-off-by: Pedro Amorim <pedro.amorim@ptfs-europe.com>
21 months agoBug 14911: Add 245 fields to itemsearch title column via biblio-title.inc
Lucas Gass [Thu, 8 Dec 2022 22:19:20 +0000 (22:19 +0000)]
Bug 14911: Add 245 fields to itemsearch title column via biblio-title.inc

To test:
1. Have some records that have these 245 fields:

    -Title 245$a
    -Subtitle 245$b
    -Medium 245$h
    -Part number 245$n
    -Part name 245$p

Note: IN KTD I have to run batchRebuildBiblioTables.pl -c

2. Apply patch and do an item search that will turn up items with the 245 fields lists above
3. Notice that those subfields are now included in the title column.

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit bc85b3b9a6817cbe06499a3e9e97fbbbb90d2167)
Signed-off-by: Pedro Amorim <pedro.amorim@ptfs-europe.com>
21 months agoBug 32603: Suggester category in Suggestions management
Frédéric Demians [Tue, 10 Jan 2023 08:26:51 +0000 (09:26 +0100)]
Bug 32603: Suggester category in Suggestions management

In Suggestions management, in the table displaying all suggestions, add
a column to display suggester category. This way, it is possible for
example for the librarian managing suggestions rather to prioritize
suggestions coming from teachers than those coming from students.

TEST :

1. Apply the patch.
2. Acquisition > Suggestions.
3. There is a new column 'Suggester category'. It can be
   displayed/hidden.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 09010a248b65c7a47973c208809c1915dac3fe0e)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
21 months agoBug 32567: (QA follow-up) Fix some labelling inconsistencies
Katrin Fischer [Sun, 5 Feb 2023 13:05:32 +0000 (14:05 +0100)]
Bug 32567: (QA follow-up) Fix some labelling inconsistencies

This makes sure that the descriptions in the pull-downs always
match for selected/unselected.
This is not only for consistency, but will also ease translations
as simple things like an additional space will create a new
string to translate.

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 226f83cbb916285b13eaa5b0ec7badb006b83fca)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
21 months agoBug 32567: Update unimarc_field_110.pl with some values
Thibaud Guillot [Wed, 4 Jan 2023 14:14:17 +0000 (15:14 +0100)]
Bug 32567: Update unimarc_field_110.pl with some values

'Script of title' values =>
e - b/c/d/e/f/g/h
i - d/e
j - f/g
l - f
n - b/c
o - a
p - a

'Translitteral code' values =>
'g' and 'h'

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 343d68d8282bba90b415bdb0342284f1be1af7d0)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
21 months agoBug 31407: Set focus for cursor to Currency when adding a new currency
Katrin Fischer [Sat, 4 Feb 2023 23:58:05 +0000 (23:58 +0000)]
Bug 31407: Set focus for cursor to Currency when adding a new currency

This makes sure that the focus is on the first field of the
form when adding a new currency.

To test:
* Go to administration > currencies
* Add a new currency
* Verify the focus is not on the form
* Apply patch
* Repeat, verify the focus is now on the first input "currency"

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit fcb19865e82c6389f64a984ed8ef0dbde5afc2d7)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
21 months agoBug 32612: (QA follow-up) Add POD and fix typo
Tomas Cohen Arazi [Tue, 7 Feb 2023 18:19:47 +0000 (15:19 -0300)]
Bug 32612: (QA follow-up) Add POD and fix typo

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit d0abe773e8d9b194e3d0d02c479f5bc2c9bd920a)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
21 months agoBug 32698: Use template wrapper for serials pages tabs
Owen Leonard [Fri, 20 Jan 2023 18:47:11 +0000 (18:47 +0000)]
Bug 32698: Use template wrapper for serials pages tabs

This patch updates three serials templates to replace tab markup with
the use of WRAPPERs.

To test requires more data than will be found in the sample data. You
need at least one subscription with issues spanning more than one year.
I suggest creating a new subscription which starts in December, then
receive one issue from December and one in January.

Apply the patch and go to Serials.

- Perform a subscription search.
  - On the search results page there should be two tabs: "Open" and
    "Closed." These tabs should work correctly.
- Open the detail view of one of your subscriptions.
  - You should see at least four tabs: "Information," "Planning,"
    "Issues," and "Summary."
  - In some cases an "Acquisition details" tab will also appear. To test
    this you must go to Acquisitions and add an order to a basket by
    choosing "From a subscription" option.
- Click "Serial collection" in the left-hand sidebar.
  - There should be tabs for each year of subscription issues in your
    collection.

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 d2f3c54261e34882f9134c5c8904cacf1c6fc51e)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
21 months agoBug 32661: (follow-up) Use more unique variable name to avoid collisions
Owen Leonard [Fri, 20 Jan 2023 16:30:02 +0000 (16:30 +0000)]
Bug 32661: (follow-up) Use more unique variable name to avoid collisions

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 2c968c02edae5283f2ff7a1cc1d397dfa9a100bd)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
21 months agoBug 32661: Use template wrapper for invoices page tabs
Owen Leonard [Tue, 17 Jan 2023 20:20:30 +0000 (20:20 +0000)]
Bug 32661: Use template wrapper for invoices page tabs

This patch implements the template WRAPPER system (see Bug 32571) for
building tabs on the invoices page.

To test you must have at least one open invoice and one closed invoice.

- Go to Acquisitions -> Invoices.
- You should see two tabs, "Open invoices" and "Closed invoices."
- The tabs should look correct and work 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 76f3507e3a2ba514eca8c74e189b53e47ce59515)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
21 months agoBug 32660: (follow-up) Use more unique variable name to avoid collisions
Owen Leonard [Fri, 20 Jan 2023 16:22:41 +0000 (16:22 +0000)]
Bug 32660: (follow-up) Use more unique variable name to avoid collisions

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 801da163ce8d23e4d94879e343a408d1ff74c364)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
21 months agoBug 32660: Use template wrapper for basket groups tabs
Owen Leonard [Tue, 17 Jan 2023 19:58:55 +0000 (19:58 +0000)]
Bug 32660: Use template wrapper for basket groups tabs

This patch implements the template WRAPPER system (see Bug 32571) for
building tabs on the basket groups page.

To test you must have at least one active vendor, one or more closed
baskets under that vendor, and at least one basket group containing a
closed basket.

Apply the patch and go to Acquisitions -> Vendor -> Basket groups.

You should see two tabs, "Open" and "Closed." The tabs should look
correct and work 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 d4662294120f09b6d9db2c0e6b6dc145e8355f23)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
21 months agoBug 32662: Use template wrapper for item circulation alerts page
Owen Leonard [Fri, 20 Jan 2023 16:39:32 +0000 (16:39 +0000)]
Bug 32662: Use template wrapper for item circulation alerts page

This patch implements the template WRAPPER system (see Bug 32571)
for building tabs on the item circulation alerts page.

To test, apply the patch and go to Administration -> Item
circulation alerts. There should be two tabs, "Checkout" and
"Check-in" which work 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 387ea53db2514bd69bbf00b1189db27a237c008f)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
21 months agoBug 32649: Use template wrapper for library transfer limits tabs
Owen Leonard [Thu, 5 Jan 2023 13:49:00 +0000 (13:49 +0000)]
Bug 32649: Use template wrapper for library transfer limits tabs

This patch implements the template WRAPPER system (see Bug 32571) for
building tabs on the library transfer limits page.

To test, apply the patch and go to Administration -> Library
transfer limits. It should look the same as before and all tabs should
function 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 c2ad24a37b02d0f8fac690d17179d7a1e22fa09e)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
21 months agoBug 32571: (follow-up) Use more unique variable name to avoid collisions
Owen Leonard [Fri, 20 Jan 2023 15:47:08 +0000 (15:47 +0000)]
Bug 32571: (follow-up) Use more unique variable name to avoid collisions

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit d9b28400165830dcdd2d4fb2952e29b138913a87)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
21 months agoBug 32571: (follow-up) Implement abstracted tabs on About page
Owen Leonard [Thu, 5 Jan 2023 12:59:10 +0000 (12:59 +0000)]
Bug 32571: (follow-up) Implement abstracted tabs on About page

This patch implements the proposed system for building tabs on the About
page.

To test, apply the patch and view the About page. It should look the
same as before and all tabs should function 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 1398f1180ca6867cbf8a6f2dec4861496eb8a8f1)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
21 months agoBug 32571: Use template wrapper to build tabbed components
Owen Leonard [Thu, 5 Jan 2023 12:54:42 +0000 (12:54 +0000)]
Bug 32571: Use template wrapper to build tabbed components

This patch adds Template::Toolkit WRAPPER blocks to html_helpers.inc so
that templates can build tabbed components while keeping tab structural
markup separate.

Each individual component of a Bootstrap tabbed interface is defined:

- Main tab container
- Tab links container
- Individual tab links
- Tab panel container
- Individual tab panels

Included is a usage example:

  [ WRAPPER tabs id= "tabs container id" ]
      [ WRAPPER tabs_nav ]
        [ WRAPPER tab_item tabname= "tab name 1" ] [ content ] [ END ]
          [ WRAPPER tab_item tabname= "tab name 2" ] [ content ] [ END ]
            ...
        [ END ]
        [ WRAPPER tab_panels ]
          [ WRAPPER tab_panel id="tab name 1"] [ content ] [ END ]
          [ WRAPPER tab_panel id="tab name 2"] [ content ] [ END ]
            ...
      [ END ]
  [ END ]

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Kyle M Hall <kyle@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 9df8e02df06a3a266f8716c19e425ec5b65fa790)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
21 months agoBug 32544: Remove flags as option from several patron form related system preferences
Katrin Fischer [Wed, 28 Dec 2022 21:05:14 +0000 (21:05 +0000)]
Bug 32544: Remove flags as option from several patron form related system preferences

Because permissions aren't actually set via the patron edit
screens, these checkboxes have no real purpose or effect.

This removes flags from the selectable fields of the following
system preferences:

* PatronSelfModificationMandatoryField
* PatronSelfRegistrationBorrowerMandatoryField
* BorrowerMandatoryField
* PatronSelfModificationBorrowerUnwantedField
* PatronSelfRegistrationBorrowerUnwantedField

To test:
* Apply patch
* Verify that the checkbox for flags can no longer be set for
these preferences

Signed-off-by: Andrew Fuerste-Henry <andrewfh@dubcolib.org>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomás Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 44d8d2efffcb38d1d91fbc8acfd1d1b13b854dbe)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
21 months agoBug 26765: Make author span a clickable link on OPAC results list
Owen Leonard [Fri, 27 Jan 2023 18:53:39 +0000 (18:53 +0000)]
Bug 26765: Make author span a clickable link on OPAC results list

This patch follows the markup of the staff interface catalog results
XSLT to make authors in OPAC search results clickable.

The patch also makes some minor CSS changes so that title and author
links are not too crowded together.

To test, apply the patch and rebuild the OPAC CSS.

- Perform a catalog search in the OPAC which will return multiple
  results.
- In the search results, each author in each search result should be a
  separate clickable link.
- The margins around the result title and authors should be
  comfortable.
- Confirm that each link takes you to the correct author search.

Signed-off-by: Barbara Johnson <barbara.johnson@bedfordtx.gov>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 517b0ae2d469ad8a1c3edc6df82de832dca8eaca)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
21 months agoBug 15869: (QA follow-up) Don't pass placeholder framework '_USE_ORIG'
Nick Clemens [Wed, 18 Jan 2023 19:53:54 +0000 (19:53 +0000)]
Bug 15869: (QA follow-up) Don't pass placeholder framework '_USE_ORIG'

This param in the dropdown is meant to signify no change, distinct from
"" when means to set to default. In rebasing this condition was lost, this patch
restores undef of the variable to avoid setting framework to an invalid value

To test:
1 - Stage a record with a match (export and import a record)
2 - Attempt to import and overlay with option 'When replacing records use this framework:' 'Keep original framework'
3 - It fails, logs note 'value too long for field frameworkcode'
4 - Apply this patch
5 - Try again, it succeeds - framework is not changed

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit ae4c09ed5eeab11938c500bee69f340a3724790c)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
21 months agoBug 15869: (QA follow-up) Add some padding around the pulldowns
Kyle Hall [Fri, 13 Jan 2023 13:23:27 +0000 (08:23 -0500)]
Bug 15869: (QA follow-up) Add some padding around the pulldowns

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 9e3a0ab4126acf67bc3cac3e9d292f8db1697b8c)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
21 months agoBug 15869: (follow-up) Don't mock undef return value
Nick Clemens [Wed, 2 Nov 2022 19:27:38 +0000 (19:27 +0000)]
Bug 15869: (follow-up) Don't mock undef return value

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit ab75204429a412dd232a2083e2116e91e6cfc573)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
21 months agoBug 15869: Unit test
Nick Clemens [Wed, 21 Sep 2022 21:13:17 +0000 (21:13 +0000)]
Bug 15869: Unit test

Signed-off-by: Andrew Fuerste-Henry <andrewfh@dubcolib.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 3a3eff3fc45a25afe8b86ef3500fda2dc0875c62)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
21 months agoBug 15869: Change framework on overlay
Nick Clemens [Tue, 13 Sep 2016 15:23:50 +0000 (15:23 +0000)]
Bug 15869: Change framework on overlay

This patch allows for selection of framework to use when overlaying
records - by default it is set to keep the initial framework

To test:
 1 - Create some records using one framework
 2 - Export the records
 3 - Edit the records to add fields not in original framework
 4 - Stage records using a rule that will find matches
 5 - Import
 6 - Note records contain new fields on display, but they are lost on edit
 7 - Apply patch
 8 - Stage records again
 9 - Select a framework that contains the new fields on import
10 - Import records
11 - Note records now use selected framework and are displayed/edited
correctly

Signed-off-by: Andrew Fuerste-Henry <andrewfh@dubcolib.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit e5f251a709f3ebfcda57cdf7f32185464a6991d5)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
21 months agoBug 32786: Display admin header on curbside pickup admin
Jonathan Druart [Mon, 6 Feb 2023 15:39:02 +0000 (16:39 +0100)]
Bug 32786: Display admin header on curbside pickup admin

Most other administration pages (those that don't have specific searches)
are set by default on system preferences search.

Test plan:
Go to admin > Curbside pickup
Confirm that the syspref search is displayed in the header

Signed-off-by: Caroline Cyr La Rose <caroline.cyr-la-rose@inlibro.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 848022352fb3c80eeb4a03b4dcc89e20fecf5724)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
21 months agoBug 32027: Fix 'librarian interface' to use 'staff interface' in Pages/HTML customiza...
Katrin Fischer [Mon, 6 Feb 2023 21:53:56 +0000 (22:53 +0100)]
Bug 32027: Fix 'librarian interface' to use 'staff interface' in Pages/HTML customizations/News

This changes all occurences of "librarian interface" to the
correct term "staff interface"

To test:
* Create a new Page
* Verify that the pull down for location has "librarian interface"
* Save your page
* Verify that the list of existing pages has "Librarian interface" as
  label for the link
* Verify that when you hover over on those links the titles read
  "librarian interface" as well
* Apply patch
* All those should read correctly now.

Signed-off-by: Caroline Cyr La Rose <caroline.cyr-la-rose@inlibro.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit abbcf684c272239d3bf891160e2c59f3855c195d)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
21 months agoBug 31768: Add tools toolbar to tags page
Katrin Fischer [Mon, 6 Feb 2023 22:06:32 +0000 (22:06 +0000)]
Bug 31768: Add tools toolbar to tags page

The tags tool was missing the toolbar on the left side.
With the filters, this patch adds the toolbar below, like
we do on other pages like HTML customizations.

To test:
* Go to Tools > Tags
* Verify no toolbar
* Apply patch
* Verify toolbar is now present
* Compare to other tool pages
* Sign off :)

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 2b63498545b41929d26ab9f3fbeecfa33e277cc3)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
21 months agoBug 32523: Links to missing fields in MARC editor error
Jan Kissig [Wed, 4 Jan 2023 13:04:28 +0000 (14:04 +0100)]
Bug 32523: Links to missing fields in MARC editor error

This bug appears after switching to the new staff interface design (from 22.05 to 22.11).
When adding/editing a biblio in staff interface leaving out mandatory fields and click on save, you get an error dialog with shortcuts/links to these missing fields. Clicking on these links should change section tabs and focus the field.
This patch fixes that error.

Test plan:
1) in staff interface go to /cgi-bin/koha/cataloguing/addbiblio.pl?frameworkcode=
2) click Save
3) Error dialog appears, informing about missing input in mandatory fields.
4) Click on tab 0 (section 0) to make sure only marc 0XX fields are visible.
5) In the error dialog click on a "Go to field" which points f.e. to section 9
6) The selected / active tab will switch to section 9 and will not focus on the selected field
7) apply patch
8) repeat step 1) to 6)

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit d7dcd3d1a8fd41bf76e1cf406f9cb92e6f998e52)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
21 months agoBug 28674: Fix typo 'hlpd' in schema comments
Katrin Fischer [Sat, 4 Feb 2023 23:04:08 +0000 (00:04 +0100)]
Bug 28674: Fix typo 'hlpd' in schema comments

Fixes the lines for old_reserves.item_level_hold and
reserves.item_level_hold comments to read 'hold'
instead of 'hpld'

To test:
* The easiest way to verify this change is by looking
at the patch itself

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 241ea0834849e445816bfab8d5d52ea9b1e25de6)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
21 months agoBug 32295: Fix punctuation for "Filters :" on serials claims page
Katrin Fischer [Sun, 5 Feb 2023 01:37:19 +0000 (01:37 +0000)]
Bug 32295: Fix punctuation for "Filters :" on serials claims page

To test:
* Add a subscription
* Generate next issue, to have a late one
* Go to serials > claims
* Select your vendor
* Verify one of the sections is labelled "Filters :"
* Apply patch
* Verify the section is now labelled "Filters:"

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 37220779fe06fbf71706930751ebef2db0d6d0a2)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
21 months agoBug 32290: Fix terminology on ILL requests page
Katrin Fischer [Sun, 5 Feb 2023 02:18:05 +0000 (03:18 +0100)]
Bug 32290: Fix terminology on ILL requests page

This makes some fixes for the terminology used in
the ill-requests.pl page:

This item cannot be issued as it has no biblio record associated with it
> This item cannot be checked out out as there is no bibliographic
  record associated with it

You must choose a branch
> You must choose a library

View borrower details
> View patron details

Test plan:
* You can set up ILL using the instructions on
  https://wiki.koha-community.org/wiki/ILL_backends
* All strings will be located on the ILL request management page or
  the ILL requests list
* Or... you could verify looking at the patch itself

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 59cffea5d0e113b59c93e780a191232d9ad6546e)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
21 months agoBug 32222: Fix capitalization in various "id is invalid"
Katrin Fischer [Sun, 5 Feb 2023 00:51:12 +0000 (01:51 +0100)]
Bug 32222: Fix capitalization in various "id is invalid"

ID is an abbreviation and should be written with capitals.

See: https://www.oxfordlearnersdictionaries.com/definition/english/identification

This fixes all occurences of "id is invalid" to read "ID is invalid"

To test:
* As some are hard to trigger warnings, the best way here is to review the patch.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 7b3f3ac2116053ca031be93e3530017e49a541c9)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
21 months agoBug 32023: Remove hr in OpacNav for CMS pages
Katrin Fischer [Mon, 6 Feb 2023 21:44:03 +0000 (22:44 +0100)]
Bug 32023: Remove hr in OpacNav for CMS pages

In a page created with the new Pages tool, there is a
<hr> above the OpacNav block.
This hr is not present on other OPAC pages and is
removed by this patch.

To test:
1. Go to Tools > Pages > New entry
2. Create a page and save
3. Copy the OPAC link
4. Go to Tools > HTML customizations > New entry
5. Create an OpacNav entry with the link to the page
6. Go to the OPAC main page
   --> Notice how the left navigation section looks
7. Click on the link on the left to go to the page
   --> an horizontal line appears above OpacNav
8. Apply patch
9. Repeat test - the horizontal line should be gone now

Signed-off-by: Caroline Cyr La Rose <caroline.cyr-la-rose@inlibro.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 9b37c6fd35084b3c51452e2c2d353ed408356d97)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
21 months agoBug 32226: Fix capitalization of "Add/Edit html content"
Katrin Fischer [Sun, 5 Feb 2023 00:57:15 +0000 (01:57 +0100)]
Bug 32226: Fix capitalization of "Add/Edit html content"

HTML is an abbreviation and as such should always be
capitalized.

To test:
* Go to administration > libraries
* Edit any existing branch
* The hint for OPAC info reads 'Add html content'
* Add some content, verify the link changes to 'Edit html content'
* Apply patch
* Verify both cases now read 'HTML'

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit a4f190d0c2ed53ea7fc6947a23ce76b1d23d7ae1)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
21 months agoBug 31860: Standardize capitalization used for item subfield descriptions
Katrin Fischer [Mon, 6 Feb 2023 22:18:41 +0000 (22:18 +0000)]
Bug 31860: Standardize capitalization used for item subfield descriptions

This standardizes "Total Holds" to "Total holds" etc.
Also changed is UNIMARC
* "Collection code" to "Collection" like MARC21
* "Current Location" to "Current library" like MARC21 (holdingbranch)
* "Permanent Location" to "Home library" like MARC21 (homebranch)

To test:
* You'll need to apply the patch and then run the web installer to
  create your frameworks
* Once you got a fresh installation, got to
  Administration > Bibliographic frameworks > Choose any
* Go to 995 (for UNIMARC) or 952 (for MARC21)
* Check the descriptions of the subfields for capitalization and
  spelling errors

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 4dba323ec30980485502ffea8bb90f412b14615a)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
21 months agoBug 32264: Fix capitalization and terminology: Show in Staff client?
Katrin Fischer [Sun, 5 Feb 2023 01:14:09 +0000 (02:14 +0100)]
Bug 32264: Fix capitalization and terminology: Show in Staff client?

This fixes several occurences of Staff client to read
staff interface.

To test:
* Activate the search filter feature via the SavedSearchFilters
  system preference
* Do a search in the staff catalogue
* Use the link "save as search filter" on top of the results list
* Verify it reads "Show in Staff client?" in the form
* Go to administration > search filters
* Verify the table has a heading "staff client"
* Edit the filter
* Verify there is the "Show in staff client" again
* Apply patch
* All those spots should now read 'staff interface'

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit c93460e808ea58f4accc0884a0b4ed11ff95def1)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
21 months agoBug 32455: Cleanup and expand ExpireReservesAutoFill.t
Nick Clemens [Wed, 14 Dec 2022 14:20:20 +0000 (14:20 +0000)]
Bug 32455: Cleanup and expand ExpireReservesAutoFill.t

The tests here reused data, and deleted the tables before starting,
with a little shifting we can use specific data and avoid mass deletion

To test:
prove -v t/db_dependent/Holds/ExpireReservesAutoFill.t

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 8637843bab8d12449fd11cb380c5192678eb6441)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
21 months agoBug 32455: Unit tests
Nick Clemens [Wed, 14 Dec 2022 13:46:24 +0000 (13:46 +0000)]
Bug 32455: Unit tests

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 317685e8968d9b5ac023ae77195ac11bcd1e7b99)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
21 months agoBug 32455: Use from_email_address for 'from' field for hold notices
Nick Clemens [Tue, 13 Dec 2022 12:01:04 +0000 (12:01 +0000)]
Bug 32455: Use from_email_address for 'from' field for hold notices

This patch updates two occurrences where the inbound library email is
used as the from address

To test:
 1 - Set a unique 'Email' and 'Reply to' address for a library
 2 - Find a patron of that library, ensure they have an email
 3 - Ensure their messaging preference for holds is 'email'
 4 - Set system preference ReservesMaxPickupDelay to -1
 5 - Set system preference  ExpireReservesMaxPickUpDelay to Allow
 6 - Set system preference ExpireReservesAutoFill to Do
 7 - Place and fill a hold for that patron at that library
 8 - Check the patron's notification tab, confirm the from address is the 'Reply to'
 9 - Place a hold for another patron on the same item
10 - Run the expired holds cronjob:
     perl misc/cronjobs/holds/cancel_expired_holds.pl --reason=whatever
11 - Check the message_queue - notice the from address is the 'reply to'
12 - Apply patch
13 - Repeat 1-11, confirm the from addresses are correct now

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 ed30887924896b883b3cba9ddc50543af3f2636e)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
21 months agoBug 32580: Fix typo in cancel link on background jobs page
Katrin Fischer [Fri, 6 Jan 2023 23:24:11 +0000 (00:24 +0100)]
Bug 32580: Fix typo in cancel link on background jobs page

One way to test:
* Make sure you are using Elasticsearch
* Edit a record in your catalog
* Go to: /cgi-bin/koha/admin/background_jobs.pl
* Uncheck 'Current jobs only'
* Cancel the job, you'll see a 404 error
* Apply patch
* Repeat, now the redirect should work right

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 2e8995343ed5628eb5227dd6a09d1e9263671c11)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
21 months agoBug 32612: (QA follow-up) Add BINMODE method to C4::SIP::Trapper
Kyle Hall [Tue, 7 Feb 2023 11:49:28 +0000 (06:49 -0500)]
Bug 32612: (QA follow-up) Add BINMODE method to C4::SIP::Trapper

The module Log::Log4perl::Appender::Screen is attempting to change
binmode during unit tests for SIPServer and is failing because of
our tie in SIPServer.pm for reasons unknown.

This patch implements the perltie method TIEHANDLE which allows the
binmode to be handled in the C4::SIP::Trapper package.

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit d00d07cae751986a220d114ff165cbf5206a0283)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
21 months agoBug 24616: (QA follow-up) Remove "This has bug" comment
Katrin Fischer [Fri, 3 Feb 2023 14:51:25 +0000 (14:51 +0000)]
Bug 24616: (QA follow-up) Remove "This has bug" comment

... hopefully because there is no more bug now!

Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 539efac9aa3f07944f0945c9b5b1cb4824cbb9c0)
Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
21 months agoBug 24616: Do not save form if user press cancel
Emmi Takkinen [Tue, 1 Nov 2022 07:21:57 +0000 (09:21 +0200)]
Bug 24616: Do not save form if user press cancel

If one starts to copy a notice but then cancels
this when pop-up is displayed, changes are still
saved. This patch fixes this.

To test:
1. Copy notice to a library where it already exists
2. Press save and then cancel when pop-up is
displayed
=> Form and changes are still saved
3. Apply this patch.
4. Repeat steps 1. and 2.
=> Form is no longer saved

Sponsored-by: Koha-Suomi Oy
Signed-off-by: ml-inlibro <marie-luce.laflamme@inlibro.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit a99f2e65301922c15aa7aa1146ee6f0e6b68aea9)
Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
21 months agoBug 24616: Allow copying notice to a branch even if it exists in that branch
Emmi Takkinen [Thu, 28 Jul 2022 12:22:20 +0000 (15:22 +0300)]
Bug 24616: Allow copying notice to a branch even if it exists in that branch

If you try to copy notice or slip to a branch which already
has that notice or slip Koha won't let you save it. Instead
pop-up saying branch already has that notice is displayed.

This patch allows users to copy and override already existing
notice or slip.

To test:
1. Find notice which exists e.g. in all branches and branch A.
2. Copy that notice, add notice screen is displayed.
3. Press save.
=> Pop-up informing that notice already exists in branch A
is displayed.
4. Apply this patch.
5. Repeat steps 2. and 3.
6. Pop-up to confirm overwrite of notice is displayed.
=> Confirm that if you press OK, notice is saved succesfully.
=> Otherwise, changes to notice should not be saved.

Also try to save the notice you tested with as a new (same code)
to branch A. Confirm that pop-up is displayed as it should be.

Sponsored-by: Koha-Suomi Oy
Signed-off-by: Nick <nick@bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 7362059bb60222ea5a03b23ae7c621933fa81adc)
Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
21 months agoBug 32772: Make all autocomplete searches 'starts_with'
Nick Clemens [Tue, 31 Jan 2023 20:15:09 +0000 (20:15 +0000)]
Bug 32772: Make all autocomplete searches 'starts_with'

To test:
1 - Add patrons with surname Fitzwilliams and Williams
2 - Enable 'PatronAutocomplete' syspref
3 - In checkout box type 'Will'
4 - You see fitwilliams first
5 - Apply patch
6 - Type 'Will'
7 - Autocomplete does not suggest Fitzwilliam, only Williams
8 - Type '%will'
9 - Fitzwilliams is suggested

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 80a61a0f66181d26d8041c886630fd64cbd0e3f1)
Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
21 months agoBug 32230: Fix capitalization of "Manage Domains"
Katrin Fischer [Sun, 5 Feb 2023 01:07:20 +0000 (02:07 +0100)]
Bug 32230: Fix capitalization of "Manage Domains"

To test:
* Go to administration > Identity providers
* Add a new identity provider and fill out all required form fields
  Hint: you can use the buttons to add example JSON to the input fields
* Save
* Verify the entry in the table now shows a "Manage Domains" button
* Apply patch
* Verify the button now reads correctly: "Manage domains"

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit adb863b219a1b25dfd6bafbe8344e51a4317381d)
Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
21 months agoBug 32881: System preferences sub menu text is hard to read
Pedro Amorim [Fri, 3 Feb 2023 16:11:02 +0000 (16:11 +0000)]
Bug 32881: System preferences sub menu text is hard to read

This patch makes the font-size slightly larger and applies a background color to the selected submenu.

To test:
Go to system preferences
Click on any side menu item and check the items in the sub menu under it
Apply patch
run yarn build
Go to system preferences again and check the changes

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 18991c25861e566b38c1565289092f55987a616f)
Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
21 months agoBug 32761: Correct typos in CircControl syspref
Andrew Fuerste-Henry [Fri, 3 Feb 2023 17:32:43 +0000 (17:32 +0000)]
Bug 32761: Correct typos in CircControl syspref

To test:
1: look up the CircControl syspref, see that it says "wether" and "libray"
2: apply patch
3: reload, see it says "whether" and "library"

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 866c39d0371ca417eb83a253c518d6d22de23ed4)
Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
21 months agoBug 32294: Fix capitalization for user ID in self checkout
Katrin Fischer [Sun, 5 Feb 2023 01:24:58 +0000 (02:24 +0100)]
Bug 32294: Fix capitalization for user ID in self checkout

Fixes capitalization of "user ID" on the self checkout help
page.

To test:
* Enable WebBasedSelfCheck
* Go to: /cgi-bin/koha/sco/sco-main.pl in the OPAC
* Log in and open help
* Verify there is a User ID within a sentence and a User id in the heading
* Apply patch
* Both should be corrected

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit a5f300d9fd78a684ae006aecfe44277ab2858310)
Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
21 months agoBug 32289: Fix punctuation in "Delete desk "X?"
Katrin Fischer [Sun, 5 Feb 2023 01:44:23 +0000 (01:44 +0000)]
Bug 32289: Fix punctuation in "Delete desk "X?"

The question mark should be after the quote instead of before.

To test:
* Enable desks using the UseCirculationDesks system preference
* Go to administration > circulation desks
* Add a new desk and save
* Delete desk
* Verify the heading reads "Delete desk "X?"
* Apply patch
* Verify the punctuation now is fixed now

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 312535a9cce93548881a526a130f70772e125780)
Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
21 months agoBug 32606: Revert Flatpickr style changes made in Bug 31943
Owen Leonard [Tue, 10 Jan 2023 19:32:56 +0000 (19:32 +0000)]
Bug 32606: Revert Flatpickr style changes made in Bug 31943

This patch removes the CSS controlling the width of a Flatpickr date
input. The side-effects of this change are worse than the problem the
change was intended to fix.

To test, apply the patch and rebuild the staff interface CSS.

Check pages which are referenced in bugs caused by Bug 31943:

- The holds page (Bug 32259)
- Checking out when specifying a date due in the past (Bug 32210)
- Circulation -> Renew (Bug 32157)

Flatpickr inputs should look correct.

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 41b67008b8b000c045de77cada3666e779fa61af)
Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
21 months agoBug 32515: Ignore no-block flag in check-in message
Nick Clemens [Tue, 27 Dec 2022 20:32:10 +0000 (20:32 +0000)]
Bug 32515: Ignore no-block flag in check-in message

Bug 12225 changed the templates to correctly pass through the no-block flag,
however, we don't have a no-block routine for checkins

This patch restore previous behaviour of performing a normal checkin when
no block was requested - it adds a new FIXME

To test:
1 - See bug 32537
    https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32537
2 - Repeat test plan on that bug, noting that there is no response when no-block = Y
3 - Apply this patch
4 - Repeat the tests and confirm no-block = Y has a standard checkin response

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Blou <philippe.blouin@inlibro.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 30fcbb44370048f6ad53d71225a0f40c6d27fbb1)
Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
21 months agoBug 32787: Patron restrictions admin page has patron categories search bar
Owen Leonard [Thu, 2 Feb 2023 14:43:38 +0000 (14:43 +0000)]
Bug 32787: Patron restrictions admin page has patron categories search bar

This patch updates the patron restriction administration page to correct
the markup around the header and breadcrumbs: Using the header WRAPPER,
using the sub-header WRAPPER, and switching to the system preferences
search bar.

The patch also corrects the page title to prevent a leading "rsaquo;"
in some cases.

Note: This patch contains indentation changes, so ignore whitespace when
viewing the diff.

To test, apply the patch and go to Administration -> Patron
restrictions. The system preferences search should be preselected in the
header search bar, and everything should look correct.

Signed-off-by: Caroline Cyr La Rose <caroline.cyr-la-rose@inlibro.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 4563e3e59b3f655a257f21045fc15f1b468f1a80)
Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
21 months agoBug 32546: Move ILL system preferences into their own tab in administration
Katrin Fischer [Fri, 20 Jan 2023 14:12:22 +0000 (14:12 +0000)]
Bug 32546: Move ILL system preferences into their own tab in administration

Without this patch the interlibrary loan related system preferences
appeared on the circulation tab, that is already quite long. As ILL
is a complete module, it deserves its own tab.

To test:
* Search for interlibrary loan related preferences in Admin, verify their number
  and location
* Apply patch
* Verfiy all the previously found preferences now appear on their own tab:
  Interlibrary loans

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 442c6c115e5b7d4b970a6b616269f3489b910b00)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
21 months agoBug 32655: Move phone and itiva variables into templates
Lucas Gass [Tue, 17 Jan 2023 18:42:28 +0000 (18:42 +0000)]
Bug 32655: Move phone and itiva variables into templates

To test:
1. Go to a patron record or create a new one.
2. Toggle the 'Patron messaging preferences' fieldset so it is hidden.
3. Notice the variables.
4. Apply patch
5. Try steps 1 & 2 again, no varibales.
6. Attempt to toggle on/off options for email/sms. When email/sms are off the digest option next to it should be disabled.
7. Go to  Administration > Patron categories and try step 6 there as well.

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 176397d7619abf79969c98b7adc20a1c52da47fd)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
21 months agoBug 32785: Typo: Maximum number of simultaneus pickups per interval (curbside pickups)
Caroline Cyr La Rose [Wed, 1 Feb 2023 19:59:38 +0000 (14:59 -0500)]
Bug 32785: Typo: Maximum number of simultaneus pickups per interval (curbside pickups)

This patch corrects a small typo in the curbside pickup administration
page.

To test:
1. Apply patch
2. Enable the CurbsidePickup system preferences
3. Go to Administration > Curbside pickup
   --> Next to Maximum patrons per interval, the tip should be "Maximum number of simultaneous pickups per interval"

Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.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 09bd0268f7d46e50f3ef9152ba4ee4411510fce2)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
21 months agoBug 32793: import_patrons.pl typo in usage
Pedro Amorim [Thu, 2 Feb 2023 10:00:39 +0000 (10:00 +0000)]
Bug 32793: import_patrons.pl typo in usage

Typo fix to prevent confusion in CLI usage

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 4734ee5d003353258222b259642f807b9f920640)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
21 months agoBug 28314: Spinning icon is not always going away for local covers in staff
Hammat Wele [Thu, 19 Jan 2023 15:50:49 +0000 (15:50 +0000)]
Bug 28314: Spinning icon is not always going away for local covers in staff

The spinner is always visible with images which are under 80-90 px high

this patch remove the spinner when the image is loaded.

To test:
1. Make sure the LocalCoverImages system preference is enabled
   1.1. Go to Administration > Global system preferences
   1.2. Search for Coverimages
   1.3. Set LocalCoverImages to 'Show'
   1.4. Click 'Save all Enhanced content preferences'
2. Add a short local cover image to a record (I added one which is just a grey rectangle with the size printed on it, to facilitate the test)
   2.1. Download the attached image
   2.2. Find a record without an image
   2.3. Click the 'Images' tab
   2.4. Click 'Upload'
   2.5. Click 'Drop files here or click to select a file' and choose the downloaded image
   2.6. Click 'Process images'
   2.7. Click on the title of the record in the page heading to access the detailed record
   --> Note that the image is displayed normally, but the spinner is also displayed
4. Apply the patch
5. Search for the previous record with the small image
6. Click on the title of the record in the page heading to access the detailed record
   --> Note that the spinner is no more displayed

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 a20dec603be52bc0c3a981445f9360b1c0c08e2d)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
21 months agoBug 30962: (QA follow-up) Rename attribute and simplify tests
Tomas Cohen Arazi [Fri, 27 Jan 2023 17:41:17 +0000 (14:41 -0300)]
Bug 30962: (QA follow-up) Rename attribute and simplify tests

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 ba40541038c9046e78d9c24282273cb9db4b10f2)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
21 months agoBug 30962: Add unit tests for /auth/password/validation endpoint
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>