Attachment 81760 Details for Bug 20996 – Bug 20996: (follow-up) Fix merge problems

[patch] Bug 20996: (follow-up) Fix merge problems

Bug-20996-follow-up-Fix-merge-problems.patch (text/plain), 2.38 KB, created by Josef Moravec on 2018-10-31 16:46:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Josef Moravec

Created: 2018-10-31 16:46:33 UTC

Size: 2.38 KB

patch

obsolete

>From b627f3d9ad66eab39cc73c443a4b9dcdac1a5e76 Mon Sep 17 00:00:00 2001
>From: Andrew Isherwood <andrew.isherwood@ptfs-europe.com>
>Date: Wed, 31 Oct 2018 15:25:17 +0000
>Subject: [PATCH] Bug 20996: (follow-up) Fix merge problems
>
>Merge conflicts resolved
>
>Signed-off-by: Josef Moravec <josef.moravec@gmail.com>
>---
> Koha/Illrequest.pm          | 30 ------------------------------
> Koha/REST/V1/Illrequests.pm |  3 +++
> 2 files changed, 3 insertions(+), 30 deletions(-)
>
>diff --git a/Koha/Illrequest.pm b/Koha/Illrequest.pm
>index 4754b43..0b4d71c 100644
>--- a/Koha/Illrequest.pm
>+++ b/Koha/Illrequest.pm
>@@ -1020,36 +1020,6 @@ sub TO_JSON {
>     my $object = $self->SUPER::TO_JSON();
>     $object->{id_prefix} = $self->id_prefix;
> 
>-    if ( scalar (keys %$embed) ) {
>-        # Augment the request response with patron details if appropriate
>-        if ( $embed->{patron} ) {
>-            my $patron = $self->patron;
>-            $object->{patron} = {
>-                firstname  => $patron->firstname,
>-                surname    => $patron->surname,
>-                cardnumber => $patron->cardnumber
>-            };
>-        }
>-        # Augment the request response with metadata details if appropriate
>-        if ( $embed->{metadata} ) {
>-            $object->{metadata} = $self->metadata;
>-        }
>-        # Augment the request response with status details if appropriate
>-        if ( $embed->{capabilities} ) {
>-            $object->{capabilities} = $self->capabilities;
>-        }
>-        # Augment the request response with library details if appropriate
>-        if ( $embed->{library} ) {
>-            $object->{library} = Koha::Libraries->find(
>-                $self->branchcode
>-            )->TO_JSON;
>-        }
>-        # Augment the request response with the number of comments if appropriate
>-        if ( $embed->{comments} ) {
>-            $object->{comments} = $self->illcomments->count;
>-        }
>-    }
>-
>     return $object;
> }
> 
>diff --git a/Koha/REST/V1/Illrequests.pm b/Koha/REST/V1/Illrequests.pm
>index 0a6dee0..0b4c8f0 100644
>--- a/Koha/REST/V1/Illrequests.pm
>+++ b/Koha/REST/V1/Illrequests.pm
>@@ -137,6 +137,9 @@ sub list {
>         if ($embed{capabilities}) {
>             $to_push->{capabilities} = $to_fetch->{$req->backend};
>         }
>+        if ($embed{comments}) {
>+            $to_push->{comments} = $req->illcomments->count;
>+        }
>         push @output, $to_push;
>     }
> 
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 20996: 76687 | 76688 | 76705 | 77100 | 79379 | 79576 | 79583 | 79584 | 79585 | 79586 | 79587 | 79588 | 79589 | 79590 | 79591 | 79592 | 81715 | 81716 | 81717 | 81718 | 81719 | 81720 | 81747 | 81748 | 81749 | 81750 | 81751 | 81752 | 81753 | 81755 | 81756 | 81757 | 81758 | 81759 | 81760 | 81761 | 81908 | 81909 | 81928 | 81967 | 81994 | 81996 | 81997 | 81998