Attachment 76421 Details for Bug 19902 – Bug 19902: (follow-up) Deal with patron column regarding on intranetreadinghistory setting

[patch] Bug 19902: (follow-up) Deal with patron column regarding on intranetreadinghistory setting

Bug-19902-follow-up-Deal-with-patron-column-regard.patch (text/plain), 2.54 KB, created by Jonathan Druart on 2018-06-25 21:05:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2018-06-25 21:05:36 UTC

Size: 2.54 KB

patch

obsolete

>From bacc85276c41a43eb0b14cd8c9a42b38a4e33df8 Mon Sep 17 00:00:00 2001
>From: Josef Moravec <josef.moravec@gmail.com>
>Date: Mon, 25 Jun 2018 11:27:03 +0000
>Subject: [PATCH] Bug 19902: (follow-up) Deal with patron column regarding on
> intranetreadinghistory setting
>
>Test plan:
>Try it with intranetreadinghistory allowed and not allowed and it should
>still work in both cases
>
>Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>---
> .../intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt    | 10 ++++++++--
> 1 file changed, 8 insertions(+), 2 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt
>index 3900344f86..8509387baa 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt
>@@ -26,12 +26,14 @@
> <h1>Checkout history for [% biblio.title |html %]</h1>
> [% IF biblio.author %]<h3>by [% biblio.author %]</h3>[% END %]
> 
>+[% SET show_patron_column = Koha.Preference('intranetreadinghistory') AND CAN_user_circulate_circulate_remaining_permissions %]
>+
> <div class="searchresults">
>     [% IF checkouts %]
>         <h4>Checked out [% checkouts.size %] times</h4>
>         <table id="table_issues">
>             <thead><tr>
>-            [% IF Koha.Preference('intranetreadinghistory') AND CAN_user_circulate_circulate_remaining_permissions %]
>+            [% IF show_patron_column %]
>             <th>Patron</th>
>             [% END %]
>             <th>Barcode</th>
>@@ -44,7 +46,7 @@
>             <tbody>
>         [% FOREACH checkout IN checkouts %]
>             <tr>
>-                [% IF Koha.Preference('intranetreadinghistory') AND CAN_user_circulate_circulate_remaining_permissions %]
>+                [% IF show_patron_column %]
>                 <td>[% INCLUDE 'patron-title.inc' patron => checkout.patron hide_patron_infos_if_needed=1 %]</td>
>                 [% END %]
>                 <td>
>@@ -103,6 +105,10 @@
>     <script type="text/javascript" id="js">
>         $(document).ready(function() {
>             var columns_settings = [% ColumnsSettings.GetColumns('catalogue', 'detail', 'checkoutshistory-table', 'json') %];
>+            [% UNLESS show_patron_column %]
>+            // Remove the patron column definition
>+            columns_settings.splice(0,1);
>+            [% END %]
>             var table = KohaTable("table_issues", {
>                 "aoColumnDefs": [
>                     { "sType": "title-string", "aTargets" : [ "title-string" ] }
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 19902: 70220 | 75642 | 76369 | 76420 | 76421