Attachment 111302 Details for Bug 23971 – Bug 23971: (follow-up) Add additional basket logging

[patch] Bug 23971: (follow-up) Add additional basket logging

Bug-23971-follow-up-Add-additional-basket-logging.patch (text/plain), 3.92 KB, created by Andrew Isherwood on 2020-10-06 12:43:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Isherwood

Created: 2020-10-06 12:43:58 UTC

Size: 3.92 KB

patch

obsolete

>From 122001676f303cc5090b3feb606bc2f548c57a3a Mon Sep 17 00:00:00 2001
>From: Andrew Isherwood <andrew.isherwood@ptfs-europe.com>
>Date: Fri, 6 Dec 2019 11:35:00 +0000
>Subject: [PATCH] Bug 23971: (follow-up) Add additional basket logging
>
>This patch adds additional basket logging as discussed in comment #14
>
>- Basket reopening
>- Basket users (manager) modification
>- Basket header modification
>
>Signed-off-by: Holly <hc@interleaf.ie>
>---
> C4/Acquisition.pm                             | 29 +++++++++++++++++++
> .../prog/en/modules/tools/viewlog.tt          |  5 +++-
> 2 files changed, 33 insertions(+), 1 deletion(-)
>
>diff --git a/C4/Acquisition.pm b/C4/Acquisition.pm
>index 59597c2629..4e2a0c4128 100644
>--- a/C4/Acquisition.pm
>+++ b/C4/Acquisition.pm
>@@ -265,6 +265,15 @@ sub ReopenBasket {
>         WHERE basketno = ?
>         AND orderstatus NOT IN ( 'complete', 'cancelled' )
>         }, {}, $basketno);
>+
>+    # Log the basket reopening
>+    if (C4::Context->preference("AcqLog")) {
>+        logaction(
>+            'ACQUISITIONS',
>+            'REOPEN_BASKET',
>+            $basketno
>+        );
>+    }
>     return;
> }
> 
>@@ -633,6 +642,16 @@ sub ModBasketHeader {
>         $sth2->execute($contractnumber,$basketno);
>     }
> 
>+    # Log the basket update
>+    if (C4::Context->preference("AcqLog")) {
>+        logaction(
>+            'ACQUISITIONS',
>+            'MODIFY_BASKET_HEADER',
>+            $basketno
>+        );
>+    }
>+
>+    return;
>     return;
> }
> 
>@@ -813,6 +832,16 @@ sub ModBasketUsers {
>     foreach my $basketuser_id (@basketusers_ids) {
>         $sth->execute($basketno, $basketuser_id);
>     }
>+
>+    # Log the basket update
>+    if (C4::Context->preference("AcqLog")) {
>+        logaction(
>+            'ACQUISITIONS',
>+            'MODIFY_BASKET_USERS',
>+            $basketno
>+        );
>+    }
>+
>     return;
> }
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt
>index 70db33d074..8de402ed35 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt
>@@ -104,8 +104,11 @@
> [%        CASE 'STATUS_CHANGE'  %]Change ILL request status
> [%        CASE 'ADD_BASKET' %]Create an acquisitions basket
> [%        CASE 'MODIFY_BASKET' %]Modify an acquisitions basket
>+[%        CASE 'MODIFY_BASKET_HEADER' %]Modify an acquisitions basket header
>+[%        CASE 'MODIFY_BASKET_USERS' %]Modify an acquisitions basket's users
> [%        CASE 'CLOSE_BASKET' %]Close an acquisitions basket
> [%        CASE 'APPROVE_BASKET' %]Approve an acquisitions basket
>+[%        CASE 'REOPEN_BASKET' %]Reopen an acquisitions basket
> [%        CASE 'Run'    %]Run
> [%        CASE %][% action | html %]
> [%    END %]
>@@ -180,7 +183,7 @@
>                                         <label for="actionALL" class="viewlog"><input type="checkbox" id="actionALL" name="actions" value=""> All</label>
>                                     [% END %]
> 
>-                                    [% FOREACH actx IN [ 'ADD' 'DELETE' 'MODIFY' 'ISSUE' 'RETURN' 'RENEW' 'CREATE' 'CANCEL' 'SUSPEND' 'RESUME' 'ADDCIRCMESSAGE' 'DELCIRCMESSAGE' 'STATUS_CHANGE' 'CHANGE PASS' 'Run' 'ADD_BASKET' 'MODIFY_BASKET' 'CLOSE_BASKET' 'APPROVE_BASKET' ] %]
>+                                    [% FOREACH actx IN [ 'ADD' 'DELETE' 'MODIFY' 'ISSUE' 'RETURN' 'RENEW' 'CREATE' 'CANCEL' 'SUSPEND' 'RESUME' 'ADDCIRCMESSAGE' 'DELCIRCMESSAGE' 'STATUS_CHANGE' 'CHANGE PASS' 'Run' 'ADD_BASKET' 'MODIFY_BASKET' 'MODIFY_BASKET_HEADER' 'MODIFY_BASKET_USERS' 'CLOSE_BASKET' 'APPROVE_BASKET' 'REOPEN_BASKET' ] %]
>                                         [% IF actions.grep(actx).size %]
>                                             <label for="action[% actx | html %]" class="viewlog"><input type="checkbox" id="action[% actx | html %]" name="actions" value="[% actx | html %]" checked="checked"> [% PROCESS translate_log_action action=actx %]</label>
>                                         [% ELSE %]
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 23971: 95285 | 95286 | 95885 | 95888 | 96063 | 96064 | 100239 | 100240 | 100241 | 103911 | 103912 | 103913 | 103945 | 108962 | 111300 | 111301 | 111302 | 111303 | 111304 | 111955 | 111956 | 111957 | 111958 | 111959 | 111960 | 112277 | 112278 | 112279 | 112280 | 112281 | 112282 | 112283 | 112284 | 112285 | 112286 | 112287 | 112288 | 112289 | 112290 | 112291 | 112298 | 112299 | 112300 | 112301 | 112302 | 112303 | 112304 | 112305 | 112306 | 112307 | 113384 | 113385 | 113386 | 113387 | 113388 | 113389 | 113390 | 113391 | 113392 | 113393 | 114857 | 114858 | 114859 | 114860 | 114861 | 114862 | 114863 | 114864 | 114865 | 114866 | 114867 | 114905 | 114906 | 114907 | 114908 | 114909 | 114910 | 114911 | 114912 | 114913 | 114914 | 114915 | 114916 | 115976 | 115977 | 115978 | 115979 | 115980 | 115981 | 115982 | 115983 | 115984 | 115985 | 115986 | 119401 | 119402 | 119403 | 119404 | 119405 | 119406 | 119407 | 119408 | 119409 | 119410 | 119411 | 119412 | 119944 | 119946 | 120048