Bugzilla – Attachment 122382 Details for
Bug 20472
Add digital scan as optional format to Article Requests
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 20472: (QA follow-up) Add few TT filters
Bug-20472-QA-follow-up-Add-few-TT-filters.patch (text/plain), 5.08 KB, created by
Marcel de Rooy
on 2021-06-24 12:13:02 UTC
(
hide
)
Description:
Bug 20472: (QA follow-up) Add few TT filters
Filename:
MIME Type:
Creator:
Marcel de Rooy
Created:
2021-06-24 12:13:02 UTC
Size:
5.08 KB
patch
obsolete
>From a614e25691714149b2142cba1e8a59d8be851014 Mon Sep 17 00:00:00 2001 >From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> >Date: Thu, 24 Jun 2021 11:50:05 +0000 >Subject: [PATCH] Bug 20472: (QA follow-up) Add few TT filters >Content-Type: text/plain; charset=utf-8 > >Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> >No more warns from qa tools. >--- > .../intranet-tmpl/prog/en/modules/circ/article-requests.tt | 6 +++--- > .../intranet-tmpl/prog/en/modules/circ/request-article.tt | 2 +- > .../opac-tmpl/bootstrap/en/modules/opac-request-article.tt | 2 +- > 3 files changed, 5 insertions(+), 5 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt >index e97eb8708b..61e94ca026 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt >@@ -25,7 +25,7 @@ > </a> > > [% IF id_arg && format=='SCAN' %] >- <a class="ar-edit-urls" href="#" onclick="HandleMulti( EditURLs, [% id_arg %], $(this) ); return false;"> >+ <a class="ar-edit-urls" href="#" onclick="HandleMulti( EditURLs, [% id_arg | html %], $(this) ); return false;"> > <i class="fa fa-edit"></i> > Edit URLs > </a> >@@ -219,7 +219,7 @@ > <td class="ar-enumchron">[% ar.item.enumchron | html %]</td> > <td class="ar-barcode">[% ar.item.barcode | html %]</td> > <td class="ar-format">[% IF ar.format == 'PHOTOCOPY' %]Copy[% ELSIF ar.format == 'SCAN' %]Scan[% END %]</td> >- <td class="ar-urls">[% IF ar.format == 'SCAN' %]<span id="url_yesno_[% ar.id %]">[% IF ar.urls %]Yes[% ELSE %]No[% END%]</span><span id="url_[% ar.id%]" style="display:none;">[% ar.urls %]</span>[% END %]</td> >+ <td class="ar-urls">[% IF ar.format == 'SCAN' %]<span id="url_yesno_[% ar.id | html %]">[% IF ar.urls %]Yes[% ELSE %]No[% END%]</span><span id="url_[% ar.id | html %]" style="display:none;">[% ar.urls | url %]</span>[% END %]</td> > <td class="ar-patron"> > <p> > <a href="/cgi-bin/koha/circ/circulation.pl?findborrower=[% ar.borrower.cardnumber | uri %]"> >@@ -322,7 +322,7 @@ > <td class="ar-enumchron">[% ar.item.enumchron | html %]</td> > <td class="ar-barcode">[% ar.item.barcode | html %]</td> > <td class="ar-format">[% IF ar.format == 'PHOTOCOPY' %]Copy[% ELSIF ar.format == 'SCAN' %]Scan[% END %]</td> >- <td class="ar-urls">[% IF ar.format == 'SCAN' %]<span id="url_yesno_[% ar.id %]">[% IF ar.urls %]Yes[% ELSE %]No[% END%]</span><span id="url_[% ar.id%]" style="display:none;">[% ar.urls %]</span>[% END %]</td> >+ <td class="ar-urls">[% IF ar.format == 'SCAN' %]<span id="url_yesno_[% ar.id | html %]">[% IF ar.urls %]Yes[% ELSE %]No[% END%]</span><span id="url_[% ar.id | html %]" style="display:none;">[% ar.urls | url %]</span>[% END %]</td> > <td class="ar-patron"> > <p> > <a href="/cgi-bin/koha/circ/circulation.pl?findborrower=[% ar.borrower.cardnumber | uri %]"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt >index 8d452ea0a2..9206dba4e2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt >@@ -420,7 +420,7 @@ > }); > > // Initialize format(s) >- var supported_formats = "[% Koha.Preference('ArticleRequestsSupportedFormats') %]"; >+ var supported_formats = "[% Koha.Preference('ArticleRequestsSupportedFormats') | $raw %]"; > if( !supported_formats.match(/PHOTOCOPY/) ) > $('#format option[value="PHOTOCOPY"]').remove(); > if( !supported_formats.match(/SCAN/) ) >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-request-article.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-request-article.tt >index 6f9f4df2ef..a002b763dc 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-request-article.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-request-article.tt >@@ -260,7 +260,7 @@ $(document).ready( function() { > }); > > // Initialize format(s) >- var supported_formats = "[% Koha.Preference('ArticleRequestsSupportedFormats') %]"; >+ var supported_formats = "[% Koha.Preference('ArticleRequestsSupportedFormats') | $raw %]"; > if( !supported_formats.match(/PHOTOCOPY/) ) > $('#format option[value="PHOTOCOPY"]').remove(); > if( !supported_formats.match(/SCAN/) ) >-- >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 20472
:
107506
|
107507
|
107508
|
107509
|
107510
|
107511
|
107512
|
111473
|
111474
|
111475
|
111476
|
111477
|
111478
|
111479
|
122366
|
122367
|
122368
|
122369
|
122370
|
122371
|
122372
|
122373
|
122374
|
122375
|
122376
|
122377
|
122378
|
122379
|
122382
|
122383
|
122699
|
122700
|
122701
|
122702
|
122703
|
122704
|
122705
|
122706
|
122775
|
122781