Bugzilla – Attachment 70810 Details for
Bug 20066
Remove forbidden patterns from .inc and .tt files
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 20066 - Remove forbidden patterns from .inc and .tt files
Bug-20066---Remove-forbidden-patterns-from-inc-and.patch (text/plain), 3.25 KB, created by
Indranil Das Gupta
on 2018-01-22 19:50:59 UTC
(
hide
)
Description:
Bug 20066 - Remove forbidden patterns from .inc and .tt files
Filename:
MIME Type:
Creator:
Indranil Das Gupta
Created:
2018-01-22 19:50:59 UTC
Size:
3.25 KB
patch
obsolete
>From 082cef9a6ae7374147997092547eaab4e9448253 Mon Sep 17 00:00:00 2001 >From: "Indranil Das Gupta (L2C2 Technologies)" <indradg@l2c2.co.in> >Date: Tue, 23 Jan 2018 01:09:51 +0530 >Subject: [PATCH] Bug 20066 - Remove forbidden patterns from .inc and .tt files > >This patch removes the forbidden patterns from the following files: > >a) datatables.inc => [% interface %] instead of [% themelang %] > >b) opac-auth-MARCdetail.tt => hard-coded path to JS resource. > >c) opac-auth-detail.tt => hard-coded path to JS resource. > >Test plan >========= > >1/ Apply the patch from Bug 20053 and run koha-qa.pl. The QA tool > will throw up these 3 files as FAIL for forbidden patterns use. > >2/ Now apply this patch and run koha-qa.pl. The result should now > be OK. >--- > koha-tmpl/opac-tmpl/bootstrap/en/includes/datatables.inc | 4 ++-- > koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-MARCdetail.tt | 2 +- > koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-detail.tt | 2 +- > 3 files changed, 4 insertions(+), 4 deletions(-) > >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/datatables.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/datatables.inc >index d3075c950f..a3962f7140 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/datatables.inc >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/datatables.inc >@@ -1,4 +1,4 @@ >-<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.dataTables.min.js"></script> >+<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script> > <script type="text/javascript"> > //<![CDATA[ > var MSG_DT_FIRST = _("First"); >@@ -17,4 +17,4 @@ > var CONFIG_EXCLUDE_ARTICLES_FROM_SORT = _("a an the"); > //]]> > </script> >-<script type="text/javascript" src="[% interface %]/[% theme %]/js/datatables.js"></script> >\ No newline at end of file >+<script type="text/javascript" src="[% interface %]/[% theme %]/js/datatables.js"></script> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-MARCdetail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-MARCdetail.tt >index 7aded0b992..c52aa51cd6 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-MARCdetail.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-MARCdetail.tt >@@ -63,7 +63,7 @@ > > [% INCLUDE 'opac-bottom.inc' %] > [% BLOCK jsinclude %] >-<script type="text/javascript" src="/opac-tmpl/lib/jquery/plugins/jquery.jstree.js"></script> >+<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.jstree.js"></script> > <script type="text/javascript"> > //<![CDATA[ > $(document).ready(function() { >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-detail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-detail.tt >index 0de567d864..96e64d00ca 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-detail.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-detail.tt >@@ -128,7 +128,7 @@ > [% INCLUDE 'opac-bottom.inc' %] > [% BLOCK jsinclude %] > [% IF ( displayhierarchy ) %] >- <script type="text/javascript" src="/opac-tmpl/lib/jquery/plugins/jquery.jstree.js"></script> >+ <script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.jstree.js"></script> > [% END %] > <script type="text/javascript"> > //<![CDATA[ >-- >2.11.0
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 20066
: 70810