Bugzilla – Attachment 69325 Details for
Bug 19523
Koha::Cache changes not passed to all plack workers with in-memory caching.
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 19532: Some fiddly fixes
Bug-19532-Some-fiddly-fixes.patch (text/plain), 6.24 KB, created by
Aleisha Amohia
on 2017-11-24 01:53:45 UTC
(
hide
)
Description:
Bug 19532: Some fiddly fixes
Filename:
MIME Type:
Creator:
Aleisha Amohia
Created:
2017-11-24 01:53:45 UTC
Size:
6.24 KB
patch
obsolete
>From b0550f684754a254d6957deb781789a545e87de1 Mon Sep 17 00:00:00 2001 >From: Aleisha Amohia <aleishaamohia@hotmail.com> >Date: Fri, 24 Nov 2017 01:31:48 +0000 >Subject: [PATCH] Bug 19532: Some fiddly fixes > >Little typos etc > >https://bugs.koha-community.org/show_bug.cgi?id=19523 >--- > koha-tmpl/intranet-tmpl/prog/en/includes/recalls-reports.inc | 2 +- > koha-tmpl/intranet-tmpl/prog/en/includes/recalls.inc | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/js/recalls.js | 1 + > koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recall.tt | 3 +-- > koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt | 2 +- > 7 files changed, 7 insertions(+), 7 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/recalls-reports.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/recalls-reports.inc >index 825f98c..aff8634 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/recalls-reports.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/recalls-reports.inc >@@ -77,7 +77,7 @@ > </td> > > <td class="recall-cancel"> >- [% IF ( !recall.cancellationdate && ( recall.is_requested || recall.is_overdue ) ) %] >+ [% IF ( !recall.cancellationdate && ( recall.is_requested || recall.is_waiting || recall.is_overdue ) ) %] > <a class="btn btn-xs btn-default" id="cancel_recall" data-id="[% recall.recall_id %]"><i class="fa fa-times"></i> Cancel</a> > [% END %] > </td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/recalls.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/recalls.inc >index b17288b..d46761e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/recalls.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/recalls.inc >@@ -63,7 +63,7 @@ > </td> > > <td class="recall-cancel"> >- [% IF ( !recall.cancellationdate && ( recall.is_requested || recall.is_overdue ) ) %] >+ [% IF ( !recall.cancellationdate && ( recall.is_requested || recall.is_waiting || recall.is_overdue ) ) %] > <a class="btn btn-xs btn-default" id="cancel_recall" data-id="[% recall.recall_id %]"><i class="fa fa-times"></i> Cancel</a> > [% END %] > </td> >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 b61b341..ded858c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >@@ -945,7 +945,7 @@ No patron matched <span class="ex">[% message | html %]</span> > </li> > > [% IF Koha.Preference('UseRecalls') && recalls.count %] >- <li><a href="#recalls" id+"recalls-tab">[% recalls.count %] Recall(s)</a></li> >+ <li><a href="#recalls" id="recalls-tab">[% recalls.count %] Recall(s)</a></li> > [% END %] > > [% IF Koha.Preference('ArticleRequests') %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >index 496b4c5..d07fc57 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >@@ -517,7 +517,7 @@ function validate1(date) { > [% END %] > </li> > [% IF Koha.Preference('UseRecalls') && recalls.count %] >- <li><a href="#recalls" id+"recalls-tab">[% recalls.count %] Recall(s)</a></li> >+ <li><a href="#recalls" id="recalls-tab">[% recalls.count %] Recall(s)</a></li> > [% END %] > [% IF Koha.Preference('ArticleRequests') %] > <li> >diff --git a/koha-tmpl/intranet-tmpl/prog/js/recalls.js b/koha-tmpl/intranet-tmpl/prog/js/recalls.js >index 1174286..a85c482 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/recalls.js >+++ b/koha-tmpl/intranet-tmpl/prog/js/recalls.js >@@ -27,6 +27,7 @@ $(document).ready(function() { > }); > > $("#recalls-table").dataTable($.extend(true, {}, dataTablesDefaults, { >+ "autoWidth": false, > "aoColumnDefs": [ > { "aTargets": [ 'nosort' ], "bSortable": false, "bSearchable": false }, > ], >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recall.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recall.tt >index 43a84e9..adfbec8 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recall.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recall.tt >@@ -44,8 +44,7 @@ > <p>You will be notified when your item is waiting to be picked up at the library.</p> > [% ELSIF not error %] > <p>All borrowable material is subject to recall if checked out and needed by someone else. We will ask the person who has checked out this item to return it so you may use it.</p> >- <p><strong>Warning</strong>: Your library does not allow recalls for x item types.</p> >-<hr> >+ <hr> > [% IF loggedinusername %] > <div class="dialog"> > <p>Place a recall on [% biblio.title %] ([% biblio.author %])?</p> <a href="/cgi-bin/koha/opac-recall.pl?op=request&itemnumber=[% itemnumber %]" class="btn btn-default btn-sm">Confirm</a> <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblio.biblionumber %]">Cancel</a> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt >index b609258..47c1aa9 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt >@@ -855,7 +855,7 @@ Using this account is not recommended because some parts of Koha will not functi > [% END %] > </tr> > </tbody> >- <table> >+ </table> > </div> > [% END # / # RECALLS.count %] > >-- >2.1.4
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 19523
:
68469
|
69325