Attachment 107913 Details for Bug 19889 – Bug 19889: (follow-up) Fix overlapping blue box and message in batch item modification

[patch] Bug 19889: (follow-up) Fix overlapping blue box and message in batch item modification

Bug-19889-follow-up-Fix-overlapping-blue-box-and-m.patch (text/plain), 3.78 KB, created by Agustín Moyano on 2020-08-06 19:04:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Agustín Moyano

Created: 2020-08-06 19:04:53 UTC

Size: 3.78 KB

patch

obsolete

>From ef0ea73f313c5c18f74e4ddd9b5e96a38fcb5965 Mon Sep 17 00:00:00 2001
>From: Agustin Moyano <agustinmoyano@theke.io>
>Date: Thu, 6 Aug 2020 15:54:49 -0300
>Subject: [PATCH] Bug 19889: (follow-up) Fix overlapping blue box and message
> in batch item modification
>
>---
> .../prog/en/modules/catalogue/moredetail.tt   |  5 +++-
> tools/batchMod.pl                             | 28 +++++++++++--------
> 2 files changed, 20 insertions(+), 13 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
>index a9d4830f75..8028f261f6 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
>@@ -50,8 +50,11 @@
>     </div>
>     </div>
> 
>+    [% IF ONLY_ONE || updated_exclude_from_local_holds_priority.defined %]
>+    <hr />
>+    [% END %]
>+
>     [% IF ( ONLY_ONE ) %]
>-        <hr />
>         <div class="dialog message">You are only viewing one item.  <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% biblionumber | uri %]&amp;bi=[% biblioitemnumber | uri %]#item[% itemnumber | uri %]">View All</a></div>
>     [% END %]
> 
>diff --git a/tools/batchMod.pl b/tools/batchMod.pl
>index 672d1d5ded..b8eeef240b 100755
>--- a/tools/batchMod.pl
>+++ b/tools/batchMod.pl
>@@ -231,10 +231,14 @@ if ($op eq "action") {
>                             }
>                         }
>                         else {
>-                            $item->exclude_from_local_holds_priority($exclude_from_local_holds_priority)->store if defined $exclude_from_local_holds_priority;
>+                            my $modified_holds_priority = 0;
>+                            if (defined $exclude_from_local_holds_priority && $item->exclude_from_local_holds_priority != $exclude_from_local_holds_priority) {
>+                                $item->exclude_from_local_holds_priority($exclude_from_local_holds_priority)->store;
>+                                $modified_holds_priority = 1;
>+                            }
>+                            my $modified = 0;
>                             if ( $values_to_modify || $values_to_blank ) {
>                                 my $localmarcitem = Item2Marc($itemdata);
>-                                my $modified = 0;
> 
>                                 for ( my $i = 0 ; $i < @tags ; $i++ ) {
>                                     my $search = $searches[$i];
>@@ -292,16 +296,16 @@ if ($op eq "action") {
>                                         }
>                                     };
>                                 }
>-                                if ($runinbackground) {
>-                                    $modified_items++ if $modified;
>-                                    $modified_fields += $modified;
>-                                    $job->set(
>-                                        {
>-                                            modified_items  => $modified_items,
>-                                            modified_fields => $modified_fields,
>-                                        }
>-                                    );
>-                                }
>+                            }
>+                            if ($runinbackground) {
>+                                $modified_items++ if $modified || $modified_holds_priority;
>+                                $modified_fields += $modified + $modified_holds_priority;
>+                                $job->set(
>+                                    {
>+                                        modified_items  => $modified_items,
>+                                        modified_fields => $modified_fields,
>+                                    }
>+                                );
>                             }
>                         }
>                         $i++;
>-- 
>2.25.0

Actions: View | Diff | Splinter Review

Attachments on bug 19889: 105715 | 105716 | 105717 | 105718 | 106435 | 106436 | 106437 | 106438 | 106439 | 106440 | 106441 | 106442 | 107180 | 107187 | 107188 | 107189 | 107190 | 107191 | 107192 | 107193 | 107194 | 107195 | 107196 | 107908 | 107909 | 107910 | 107911 | 107912 | 107913 | 107926 | 107927 | 107928 | 107929 | 107930 | 107931 | 107948 | 108213 | 108214 | 108215 | 108216 | 108217 | 108218 | 108219 | 108220 | 108593 | 108594 | 108595 | 108725 | 108726 | 108728 | 109131 | 109132 | 109285 | 109364 | 109419