Attachment 84497 Details for Bug 20750 – Bug 20750: (follow-up) Fix dependency merge error

[patch] Bug 20750: (follow-up) Fix dependency merge error

Bug-20750-follow-up-Fix-dependency-merge-error.patch (text/plain), 1.31 KB, created by Andrew Isherwood on 2019-01-28 16:38:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Isherwood

Created: 2019-01-28 16:38:31 UTC

Size: 1.31 KB

patch

obsolete

>From 0fd132e3ac1eb423d2bc09dfe645d78c23ed6aeb Mon Sep 17 00:00:00 2001
>From: Andrew Isherwood <andrew.isherwood@ptfs-europe.com>
>Date: Mon, 28 Jan 2019 16:37:07 +0000
>Subject: [PATCH] Bug 20750: (follow-up) Fix dependency merge error
>
>During the dependency merge the embed of status_alias in the API call
>had got lost, resulting in the user defined statuses not displaying.
>This patch fixes that.
>---
> koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt
>index ca732f0f30..7f12e7ce40 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt
>@@ -875,7 +875,7 @@
>             // Get our data from the API and process it prior to passing
>             // it to datatables
>             var ajax = $.ajax(
>-                '/api/v1/illrequests?embed=metadata,patron,capabilities,library'
>+                '/api/v1/illrequests?embed=metadata,patron,capabilities,library,status_alias'
>                 ).done(function() {
>                     var data = JSON.parse(ajax.responseText);
>                     // Make a copy, we'll be removing columns next and need
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 20750: 75304 | 75326 | 75329 | 75330 | 77757 | 77816 | 77817 | 77818 | 77931 | 79822 | 79823 | 79824 | 80860 | 82082 | 82083 | 82085 | 82096 | 82097 | 82098 | 82099 | 82500 | 82501 | 82502 | 84193 | 84194 | 84195 | 84203 | 84266 | 84497 | 84498 | 84821 | 84823 | 84824 | 84825 | 84826 | 84827 | 84973 | 84974 | 84975 | 84976 | 84977 | 84978 | 84979 | 85097 | 85098 | 85099 | 85101 | 85113 | 85238 | 85266 | 85697 | 85698 | 85699 | 85700 | 85701 | 85702 | 85703 | 85704 | 85705 | 85706 | 85707 | 85708 | 85709 | 85710 | 85756 | 85757 | 85765 | 85826 | 85827 | 85829 | 85830 | 85831 | 85832 | 85833 | 85834 | 85835 | 85836 | 85837 | 85838 | 85839 | 85840 | 85841 | 85842 | 85843 | 85844 | 85845 | 85846 | 85847 | 85848 | 86434 | 86435 | 86436 | 86534 | 86535 | 86536