Bugzilla – Attachment 100765 Details for
Bug 21296
Suspend hold ignores system preference on intranet
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 21296: [18.11.x] Fix wrong resolution conflict
Bug-21296-1811x-Fix-wrong-resolution-conflict.patch (text/plain), 1.93 KB, created by
Jonathan Druart
on 2020-03-16 15:57:34 UTC
(
hide
)
Description:
Bug 21296: [18.11.x] Fix wrong resolution conflict
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2020-03-16 15:57:34 UTC
Size:
1.93 KB
patch
obsolete
>From c45d4007245989466a6f40ccf4851a9a97b83245 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Mon, 16 Mar 2020 16:56:13 +0100 >Subject: [PATCH] Bug 21296: [18.11.x] Fix wrong resolution conflict > >On > commit a230878b6f3d3afa5d7f33c9d816bd6272c5b1a1 > Bug 21296: suspend hold ignores system preference on intranet > >See comment 10. >--- > koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >index bf14dab301..1eb71bb2aa 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >@@ -982,6 +982,7 @@ No patron matched <span class="ex">[% message | html %]</span> > > var MSG_EXPORT_SELECT_CHECKOUTS = _("You must select checkout(s) to export"); > var MSG_CONFIRM_DELETE_MESSAGE = _("Are you sure you want to delete this message? This cannot be undone."); >+ columns_settings = [% ColumnsSettings.GetColumns( 'circ', 'circulation', 'issues-table', 'json' ) | $raw %] > var SuspendHoldsIntranet = [% ( Koha.Preference('SuspendHoldsIntranet') ) ? 1 : 0 | html %]; > </script> > [% Asset.js("js/pages/circulation.js") | $raw %] >@@ -989,8 +990,6 @@ No patron matched <span class="ex">[% message | html %]</span> > [% Asset.js("js/holds.js") | $raw %] > [% Asset.js("js/circ-patron-search-results.js") | $raw %] > <script> >- columns_settings_issues_table = [% ColumnsSettings.GetColumns( 'circ', 'circulation', 'issues-table', 'json' ) | $raw %] >- columns_settings_borrowers_table = [% ColumnsSettings.GetColumns( 'circ', 'circulation', 'table_borrowers', 'json' ) | $raw %] > > [% IF borrowernumber and patron %] > if($.cookie("holdfor") != [% patron.borrowernumber | html %]){ >-- >2.20.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 21296
:
95624
|
97579
|
97590
| 100765