Attachment 57132 Details for Bug 17537 – Bug 17537: Fix valid-templates.t for some include files

[patch] Bug 17537: Fix valid-templates.t for some include files

Bug-17537-Fix-valid-templatest-for-some-include-fi.patch (text/plain), 2.71 KB, created by Tomás Cohen Arazi (tcohen) on 2016-11-03 14:23:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tomás Cohen Arazi (tcohen)

Created: 2016-11-03 14:23:44 UTC

Size: 2.71 KB

patch

obsolete

>From bf1ed55710253706cd9de002cb97e49506bcb08d Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Wed, 2 Nov 2016 10:50:54 +0000
>Subject: [PATCH] Bug 17537: Fix valid-templates.t for some include files
>
>3 include files do not pass the template validation tests:
> - koha-tmpl/intranet-tmpl/prog/en/includes/admin-items-search-field-form.inc
> - koha-tmpl/intranet-tmpl/prog/en/includes/subscriptions-search.inc
> - koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-topissues.inc
>
>This is because they process a block which has not been declared before.
>As they are include files, they cannot stand on their own.
>We could have added them to the exclude file list of xt/author/valid-templates.t
>but I think it's better to keep them into the validation loop.
>
>Test plan:
>  prove xt/author/valid-templates.t
>should return green
>And the library dropdown list should be correctly populated on the pages these files are included
>(opac-topissues for instance)
>
>Signed-off-by: Claire Gravely <claire_gravely@hotmail.com>
>Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
>---
> .../intranet-tmpl/prog/en/includes/admin-items-search-field-form.inc     | 1 +
> koha-tmpl/intranet-tmpl/prog/en/includes/subscriptions-search.inc        | 1 +
> koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-topissues.inc             | 1 +
> 3 files changed, 3 insertions(+)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/admin-items-search-field-form.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/admin-items-search-field-form.inc
>index fd39a47..a55f6c3 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/admin-items-search-field-form.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/admin-items-search-field-form.inc
>@@ -1,3 +1,4 @@
>+[% PROCESS 'html_helpers.inc' %]
> <ol>
>   <li>
>       [% IF field %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/subscriptions-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/subscriptions-search.inc
>index b7f890c..7fdea9c 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/subscriptions-search.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/subscriptions-search.inc
>@@ -1,3 +1,4 @@
>+[% PROCESS 'html_helpers.inc' %]
> <div id="advsearch">
>     <form action="" method="get">
>         <fieldset class="brief">
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-topissues.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-topissues.inc
>index 2b520c3..2ce6921 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-topissues.inc
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-topissues.inc
>@@ -1,5 +1,6 @@
> [% USE Koha %]
> [% USE Branches %]
>+[% PROCESS 'html_helpers.inc' %]
> 
> <div id="search-facets">
>     <form method="get" action="/cgi-bin/koha/opac-topissues.pl">
>-- 
>2.7.4

Actions: View | Diff | Splinter Review

Attachments on bug 17537: 57076 | 57103 | 57132