Attachment 141225 Details for Bug 25426 – Bug 25426: (QA follow-up) Small fixes to POD and INSERT IGNORE or datatabase update

[patch] Bug 25426: (QA follow-up) Small fixes to POD and INSERT IGNORE or datatabase update

Bug-25426-QA-follow-up-Small-fixes-to-POD-and-INSE.patch (text/plain), 2.29 KB, created by Katrin Fischer on 2022-10-03 09:46:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2022-10-03 09:46:28 UTC

Size: 2.29 KB

patch

obsolete

>From 14bd28b9ab81983b2b7f9dc1e32f94d1b3c4b2ef Mon Sep 17 00:00:00 2001
>From: Katrin Fischer <katrin.fischer.83@web.de>
>Date: Mon, 3 Oct 2022 11:31:06 +0200
>Subject: [PATCH] Bug 25426: (QA follow-up) Small fixes to POD and INSERT
> IGNORE or datatabase update
>
>* Makes sure the system preference is added with INSERT IGNORE
>* Some smaller fixes/additions to the POD of get_return_branch_policy
>
>Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
>---
> Koha/CirculationRules.pm                       | 6 +++---
> installer/data/mysql/atomicupdate/bug_25426.pl | 2 +-
> 2 files changed, 4 insertions(+), 4 deletions(-)
>
>diff --git a/Koha/CirculationRules.pm b/Koha/CirculationRules.pm
>index 8b5d4807d9..c44ac8510e 100644
>--- a/Koha/CirculationRules.pm
>+++ b/Koha/CirculationRules.pm
>@@ -479,9 +479,9 @@ sub clone {
>   my $returnbranch = Koha::CirculationRules->get_return_branch_policy($item);
> 
> Returns the branch to use for returning the item based on the
>-item type, and a branch selected via CircControlReturnsBrnch.
>+item type, and a branch selected via CircControlReturnsBranch.
> 
>-The return value is the branch to which to return item.  Possible values:
>+The return value is the branch to which to return the item. Possible values:
>   noreturn: do not return, let item remain where checked in (floating collections)
>   homebranch: return to item's home branch
>   holdingbranch: return to issuer branch
>@@ -490,7 +490,7 @@ This searches branchitemrules in the following order:
>   * Same branchcode and itemtype
>   * Same branchcode, itemtype '*'
>   * branchcode '*', same itemtype
>-  * branchcode and itemtype '*'
>+  * branchcode '*' and itemtype '*'
> 
> =cut
> 
>diff --git a/installer/data/mysql/atomicupdate/bug_25426.pl b/installer/data/mysql/atomicupdate/bug_25426.pl
>index aa7d513ac4..38bf370a03 100755
>--- a/installer/data/mysql/atomicupdate/bug_25426.pl
>+++ b/installer/data/mysql/atomicupdate/bug_25426.pl
>@@ -8,7 +8,7 @@ return {
>         my ($dbh, $out) = @$args{qw(dbh out)};
> 
>         $dbh->do(q{
>-            INSERT INTO systempreferences VALUES (
>+            INSERT IGNORE INTO systempreferences VALUES (
>               'CircControlReturnsBranch','ItemHomeLibrary','ItemHomeLibrary|ItemHoldingLibrary|CheckInLibrary',
>               'Specify the agency that controls the return policy','Choice'
>             )
>-- 
>2.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 25426: 139798 | 139802 | 139964 | 141224 | 141225 | 141226 | 141227