Bugzilla – Attachment 138472 Details for
Bug 29983
Display the return claims column in the circulation overdues page (overdue.tt)
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 29983: Show the column by default but hide if the feature is disabled
Bug-29983-Show-the-column-by-default-but-hide-if-t.patch (text/plain), 3.46 KB, created by
Jonathan Druart
on 2022-08-01 14:00:31 UTC
(
hide
)
Description:
Bug 29983: Show the column by default but hide if the feature is disabled
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2022-08-01 14:00:31 UTC
Size:
3.46 KB
patch
obsolete
>From ba03ccc6eb46dfe4a2a3dc5e5b11dc9f8b7d499e Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Mon, 1 Aug 2022 15:54:42 +0200 >Subject: [PATCH] Bug 29983: Show the column by default but hide if the feature > is disabled > >Prior to this patch there was a blink, the column was displayed then >hidden if the column was hidden. >Also we could display the column even if the feature was disabled. > >Now the column is shown by default, and hidden if the feature is >disabled. > >Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >--- > admin/columns_settings.yml | 1 - > .../prog/en/modules/circ/overdue.tt | 25 +++++++++++-------- > 2 files changed, 15 insertions(+), 11 deletions(-) > >diff --git a/admin/columns_settings.yml b/admin/columns_settings.yml >index 560b3cf5a8c..cc51d00c2ca 100644 >--- a/admin/columns_settings.yml >+++ b/admin/columns_settings.yml >@@ -1507,7 +1507,6 @@ modules: > columnname: non-public_note > - > columnname: claims_returned >- is_hidden: 1 > > print_summary: > print-summary-checkouts: >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt >index 04b43cd2107..bceb480a87a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt >@@ -94,7 +94,9 @@ > <th>Item type</th> > <th>Price</th> > <th>Non-public note</th> >- <th>Return claims</th> >+ [% IF Koha.Preference('ClaimReturnedLostValue') %] >+ <th>Return claims</th> >+ [% END %] > </tr> > </thead> > [%- BLOCK subject -%]Overdue:[%- END -%] >@@ -120,19 +122,17 @@ > <td>[% ItemTypes.GetDescription( overdueloo.itemtype ) | html %]</td> > <td>[% overdueloo.replacementprice | $Price %]</td> > <td>[% overdueloo.itemnotes_nonpublic | html %]</td> >- <td> >- [% IF ( overdueloo.return_claim_created_on ) %] >+ [% IF Koha.Preference('ClaimReturnedLostValue') %] >+ <td> >+ [% IF ( overdueloo.return_claim_created_on ) %] > <span class="badge">[% overdueloo.return_claim_created_on | $KohaDates with_hours => 1 %]</span> >- [% ELSIF Koha.Preference('ClaimReturnedLostValue') %] >+ [% ELSE %] > <a class="btn btn-default btn-xs claim-returned-btn" data-itemnumber=[% overdueloo.itemnum | html %]> > <i class="fa fa-exclamation-circle"></i> Claim returned > </a> >- [% ELSE %] >- <a class="btn btn-default btn-xs" disabled="disabled" title="ClaimReturnedLostValue is not set, this feature is disabled"> >- <i class="fa fa-exclamation-circle"></i> Claim returned >- </a> >- [% END %] >- </td> >+ [% END %] >+ </td> >+ [% END %] > </tr> > [% END %] > </tbody> >@@ -319,6 +319,11 @@ > > $(document).ready(function(){ > var table_settings = [% TablesSettings.GetTableSettings( 'circ', 'overdues', 'circ-overdues', 'json' ) | $raw %]; >+ >+ [% IF !Koha.Preference('ClaimReturnedLostValue') %] >+ table_settings['columns'].splice(13, 1); >+ [% END %] >+ > KohaTable("overduest", { > "sPaginationType": "full", > "autoWidth": false, >-- >2.25.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 29983
:
130004
|
130036
|
130037
|
130121
|
130240
|
134223
|
136334
|
138470
|
138471
| 138472 |
138801