Attachment 77560 Details for Bug 19719 – Bug 19719: (follow-up) Show description instead of code

[patch] Bug 19719: (follow-up) Show description instead of code

Bug-19719-follow-up-Show-description-instead-of-co.patch (text/plain), 4.85 KB, created by Julian Maurice on 2018-08-08 10:47:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Julian Maurice

Created: 2018-08-08 10:47:43 UTC

Size: 4.85 KB

patch

obsolete

>From 4d424b359c5da30012386989a2a90896708e7a25 Mon Sep 17 00:00:00 2001
>From: Katrin Fischer <katrin.fischer.83@web.de>
>Date: Sat, 31 Mar 2018 10:13:57 +0200
>Subject: [PATCH] Bug 19719: (follow-up) Show description instead of code
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>This follow-up changes the display from collection code
>to description, following the existing pattern for
>location.
>
>To test:
>- Repeat test plan from first patch
>- Verfiy now the collection descrption shows
>- Change column setting in administration
>- Verify they work as expected
>
>Signed-off-by: SÃ©verine QUEUNE <severine.queune@bulac.fr>
>Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
>---
> admin/columns_settings.yml                               | 4 ++--
> .../intranet-tmpl/prog/en/includes/checkouts-table.inc   | 2 +-
> koha-tmpl/intranet-tmpl/prog/js/checkouts.js             | 4 ++--
> svc/checkouts                                            | 9 +++++++--
> 4 files changed, 12 insertions(+), 7 deletions(-)
>
>diff --git a/admin/columns_settings.yml b/admin/columns_settings.yml
>index cec35f35de..3e2a6723e5 100644
>--- a/admin/columns_settings.yml
>+++ b/admin/columns_settings.yml
>@@ -252,7 +252,7 @@ modules:
>         -
>           columnname: item_type
>         -
>-          columnname: collection_code
>+          columnname: collection
>         -
>           columnname: location
>         -
>@@ -409,7 +409,7 @@ modules:
>         -
>           columnname: item_type
>         -
>-          columnname: collection_code
>+          columnname: collection
>         -
>           columnname: location
>         -
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc
>index aa38cc8531..f7c68218c4 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc
>@@ -16,7 +16,7 @@
>                         <th scope="col">Due date</th>
>                         <th scope="col">Title</th>
>                         <th scope="col">Item type</th>
>-                        <th scope="col">Collection code</th>
>+                        <th scope="col">Collection</th>
>                         <th scope="col">Location</th>
>                         <th scope="col">Home library</th>
>                         <th scope="col">Checked out on</th>
>diff --git a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js b/koha-tmpl/intranet-tmpl/prog/js/checkouts.js
>index c97c988166..a96a48d668 100644
>--- a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js
>+++ b/koha-tmpl/intranet-tmpl/prog/js/checkouts.js
>@@ -291,7 +291,7 @@ $(document).ready(function() {
>                     "sType": "anti-the"
>                 },
>                 { "mDataProp": "itemtype_description" },
>-                { "mDataProp": "ccode" },
>+                { "mDataProp": "collection" },
>                 { "mDataProp": "location" },
>                 { "mDataProp": "homebranch" },
>                 { "mDataProp": "issuedate_formatted" },
>@@ -608,7 +608,7 @@ $(document).ready(function() {
>                         "sType": "anti-the"
>                     },
>                     { "mDataProp": "itemtype" },
>-                    { "mDataProp": "ccode" },
>+                    { "mDataProp": "collection" },
>                     { "mDataProp": "location" },
>                     { "mDataProp": "issuedate_formatted" },
>                     { "mDataProp": "branchname" },
>diff --git a/svc/checkouts b/svc/checkouts
>index d1fb8d34f9..9a1b3a5648 100755
>--- a/svc/checkouts
>+++ b/svc/checkouts
>@@ -90,7 +90,7 @@ my $sql = '
>         items.itype,
>         biblioitems.itemtype,
> 
>-        items.ccode,
>+        items.ccode AS collection,
> 
>         borrowernumber,
>         surname,
>@@ -156,6 +156,11 @@ while ( my $c = $sth->fetchrow_hashref() ) {
>         my $av = Koha::AuthorisedValues->search({ category => 'LOC', authorised_value => $c->{location} });
>         $location = $av->count ? $av->next->lib : '';
>     }
>+    my $collection;
>+    if ( $c->{collection} ) {
>+        my $av = Koha::AuthorisedValues->search({ category => 'CCODE', authorised_value => $c->{collection} });
>+        $collection = $av->count ? $av->next->lib : '';
>+    }
>     my $lost;
>     if ( $c->{itemlost} ) {
>         my $av = Koha::AuthorisedValues->search({ category => 'LOST', authorised_value => $c->{itemlost} });
>@@ -173,7 +178,7 @@ while ( my $c = $sth->fetchrow_hashref() ) {
>         barcode              => $c->{barcode},
>         itemtype             => $item_level_itypes ? $c->{itype} : $c->{itemtype},
>         itemtype_description => $itemtype ? $itemtype->translated_description : q{},
>-        ccode                => $c->{ccode},
>+        collection           => $collection,
>         location             => $location,
>         homebranch           => $c->{homebranch},
>         itemnotes            => $c->{itemnotes},
>-- 
>2.17.1

Actions: View | Diff | Splinter Review

Attachments on bug 19719: 72773 | 72829 | 73510 | 73511 | 74538 | 74539 | 76199 | 77559 | 77560 | 77561