Bugzilla – Attachment 4828 Details for
Bug 6640
Template errors in defining default variable values causes information not to be displayed
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Proposed fix
0001-Fix-for-Bug-6640-Locations-not-showing-in-circ-repor.patch (text/plain), 17.66 KB, created by
Owen Leonard
on 2011-08-03 14:50:30 UTC
(
hide
)
Description:
Proposed fix
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2011-08-03 14:50:30 UTC
Size:
17.66 KB
patch
obsolete
>From 7ef1ea3a81156f5328a58b7df0b6a965d66e32d9 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Tue, 2 Aug 2011 15:23:00 -0400 >Subject: [PATCH] Fix for Bug 6640, Locations not showing in circ reports >Content-Type: text/plain; charset="utf-8" > >An invalid template syntax for defining a variable's default >value is found in the circ report template and several >others: > >[% DEFAULT LibraryNameTitle="Koha Online" %] > >Based on the T:T docs this appears to be the correct way of defining >a default value: > >[% LibraryNameTitle or "Koha Online" %] > >Reference: > >http://template-toolkit.org/docs/manual/Syntax.html#section_Implicit_Directives_GET_and_SET >--- > .../prog/en/modules/admin/preferences.tt | 6 +++--- > .../intranet-tmpl/prog/en/modules/circ/overdue.tt | 4 ++-- > .../prog/en/modules/circ/reserveratios.tt | 4 ++-- > .../intranet-tmpl/prog/en/modules/circ/returns.tt | 2 +- > .../prog/en/modules/circ/selectbranchprinter.tt | 8 ++++---- > .../en/modules/reports/guided_reports_start.tt | 4 ++-- > .../prog/en/modules/reports/issues_stats.tt | 10 +++++++--- > .../prog/en/modules/reports/reserves_stats.tt | 10 +++++++--- > koha-tmpl/opac-tmpl/prog/en/modules/ilsdi.tt | 2 +- > .../prog/en/modules/opac-readingrecord.tt | 2 +- > .../opac-tmpl/prog/en/modules/opac-reserve.tt | 2 +- > koha-tmpl/opac-tmpl/prog/en/modules/opac-review.tt | 2 +- > koha-tmpl/opac-tmpl/prog/en/modules/opac-tags.tt | 2 +- > .../opac-tmpl/prog/en/modules/opac-tags_subject.tt | 2 +- > .../opac-tmpl/prog/en/modules/sco/sco-main.tt | 2 +- > 15 files changed, 35 insertions(+), 27 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt >index ef7becc..6d49ca7 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt >@@ -83,9 +83,9 @@ > [% IF ( CHUNK.type_text ) %] > [% CHUNK.contents %] > [% ELSIF ( CHUNK.type_input ) %] >- <input type="[%IF CHUNK.input_type %][% CHUNK.input_type %][% ELSE %]text[% END %]" name="pref_[% CHUNK.name %]" id="pref_[% CHUNK.name %]" class="preference preference-[% DEFAULT CHUNK.class="short" %]" value="[% CHUNK.value %]" autocomplete="off" /> [% IF ( CHUNK.dateinput ) %]<span class="hint">[% INCLUDE 'date-format.inc' %]</span>[% END %] >+ <input type="[%IF CHUNK.input_type %][% CHUNK.input_type %][% ELSE %]text[% END %]" name="pref_[% CHUNK.name %]" id="pref_[% CHUNK.name %]" class="preference preference-[% CHUNK.class or "short" %]" value="[% CHUNK.value %]" autocomplete="off" /> [% IF ( CHUNK.dateinput ) %]<span class="hint">[% INCLUDE 'date-format.inc' %]</span>[% END %] > [% ELSIF ( CHUNK.type_select ) %] >- <select name="pref_[% CHUNK.name %]" id="pref_[% CHUNK.name %]" class="preference preference-[% DEFAULT CHUNK.class="choice" %]"> >+ <select name="pref_[% CHUNK.name %]" id="pref_[% CHUNK.name %]" class="preference preference-[% CHUNK.class or "choice" %]"> > [% FOREACH CHOICE IN CHUNK.CHOICES %] > [% IF ( CHOICE.selected ) %] > <option value="[% CHOICE.value %]" selected="selected"> >@@ -98,7 +98,7 @@ > </select> > [% ELSIF ( CHUNK.type_textarea ) %] > <a class="expand-textarea" style="display: none" href="#">Click to Edit</a> >- <textarea name="pref_[% CHUNK.name %]" id="pref_[% CHUNK.name %]" class="preference preference-[% DEFAULT CHUNK.class="short" %]">[% CHUNK.value %]</textarea> >+ <textarea name="pref_[% CHUNK.name %]" id="pref_[% CHUNK.name %]" class="preference preference-[% CHUNK.class or "short" %]">[% CHUNK.value %]</textarea> > [% ELSIF ( CHUNK.type_languages ) %] > <dl> > [% FOREACH language IN CHUNK.languages %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt >index c511b1c..2f5ed82 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt >@@ -233,9 +233,9 @@ > <li><label for="order">Sort By:</label> <select name="order" id="order"> > [% FOREACH ORDER_LOO IN ORDER_LOOP %] > [% IF ( ORDER_LOO.selected ) %] >- <option value="[% DEFAULT ORDER_LOO.ordervalue="" %]" selected="selected"> >+ <option value="[% ORDER_LOO.ordervalue %]" selected="selected"> > [% ELSE %] >- <option value="[% DEFAULT ORDER_LOO.ordervalue="" %]"> >+ <option value="[% ORDER_LOO.ordervalue %]"> > [% END %] > [% IF ( ORDER_LOO.order_date_due ) %]Due Date > [% ELSIF ( ORDER_LOO.order_borrower ) %]Patron >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt >index 30e676e..8fe571b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt >@@ -9,7 +9,7 @@ > <script type="text/javascript" src="[% themelang %]/lib/calendar/calendar-setup.js"></script> > <!-- End of additions --> > <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> >-<script type="text/javascript" language="JavaScript"> >+<script type="text/javascript"> > //<![CDATA[ > $.tablesorter.addParser({ > id: 'articles', >@@ -55,7 +55,7 @@ $.tablesorter.addParser({ > <h3>Calculated on [% todaysdate %]. From [% from %] > to [% to %]</h3> > <p>These items have a hold ratio ≥ [% ratio %].</p> >-<div class="sql">[% DEFAULT sql="" %]</div> >+<div class="sql">[% sql %]</div> > > [% IF ( reserveloop ) %] > <table id="holdst"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >index 8b68cb9..42aecbe 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >@@ -188,7 +188,7 @@ function Dopop(link) { > [% IF ( transfer ) %] > <!-- transfer: item with no reservation, must be returned to its homebranch --> > <div class="dialog message"> >- <h3>Please return <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber %]">[% DEFAULT title="item" |html %]</a> to [% homebranchname %]</h3></div>[% END %] >+ <h3>Please return <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber %]">[% title or "item" |html %]</a> to [% homebranchname %]</h3></div>[% END %] > > [% IF ( needstransfer ) %] > <!-- needstransfer --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tt >index 4db3ccd..40141be 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tt >@@ -26,15 +26,15 @@ > Updated:<ul> > [% FOREACH update IN updated %] > [% IF ( update.updated_branch ) %] >- <li>Library: [% DEFAULT update.old_branch="?" %] ⇒ [% DEFAULT update.LoginBranchcode="?" %]</li> >+ <li>Library: [% update.old_branch or "?" %] ⇒ [% update.LoginBranchcode or "?" %]</li> > [% ELSIF ( update.updated_printer ) %] >- <!-- FIXME: <li>Printer: [% DEFAULT update.old_printer="?" %] ⇒ [% DEFAULT update.new_printer="?" %]</li> --> >+ <!-- FIXME: <li>Printer: [% update.old_printer or "?" %] ⇒ [% update.new_printer or "?" %]</li> --> > [% ELSE %] > <li>ERROR - unknown</li> > [% END %] > [% END %] > </ul> >-<form method="post" action="[% DEFAULT referer="/cgi-bin/koha/circ/circulation.pl" |html %]"> >+<form method="post" action="[% referer or "/cgi-bin/koha/circ/circulation.pl" |html %]"> > <div class="noshow"> > [% FOREACH recycle_loo IN recycle_loop %] > <input type="text" name="[% recycle_loo.param %]" value="[% recycle_loo.value |html %]" /> >@@ -83,7 +83,7 @@ Updated:<ul> > [% FOREACH recycle_loo IN recycle_loop %] > <input type="text" name="[% recycle_loo.param %]" value="[% recycle_loo.value |html %]" /> > [% END %] >- <input type="hidden" name="oldreferer" value="[% DEFAULT referer="/cgi-bin/koha/circ/circulation.pl" |html %]" /> >+ <input type="hidden" name="oldreferer" value="[% referer or "/cgi-bin/koha/circ/circulation.pl" |html %]" /> > </div> > </form> > <!-- /updated --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt >index e3df4e2..0449c84 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt >@@ -541,7 +541,7 @@ canned reports and writing custom SQL reports.</p> > <legend>Create Report From SQL</legend> > <ol> > <li><label for="reportname">Report Name:</label> <input type="text" id="reportname" name="reportname" [% IF ( reportname ) %] value="[% reportname %]"[% END %] /> </li> >- <li><label for="notes">Notes:</label> <textarea id="notes" name="notes" cols="50" rows="2">[% DEFAULT notes="" %]</textarea></li> >+ <li><label for="notes">Notes:</label> <textarea id="notes" name="notes" cols="50" rows="2">[% notes %]</textarea></li> > <li><label for="types">Type:</label> > <select id="types" name="types"> > <option value="1">Tabular</option> >@@ -554,7 +554,7 @@ canned reports and writing custom SQL reports.</p> > <fieldset class="rows"> > <legend>SQL:</legend> > <div style="margin:1em;"> >-<textarea id="sql" name="sql" cols="50" rows="10">[% DEFAULT sql="" %]</textarea> >+<textarea id="sql" name="sql" cols="50" rows="10">[% sql %]</textarea> > </div> > </fieldset> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt >index 8941404..6a2e14b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt >@@ -44,10 +44,14 @@ > <th>TOTAL</th> > </tr> > [% FOREACH loopro IN mainloo.looprow %] >- <tr[% UNLESS ( loop.odd ) %] class="highlight"[% END %]> >- <td>[% DEFAULT loopro.rowtitle_display="UNKNOWN VALUE" |html %]</td> >+ [% IF ( loop.odd ) %] >+ <tr> >+ [% ELSE %] >+ <tr class="highlight"> >+ [% END %] >+ <td>[% loopro.rowtitle_display or "UNKNOWN VALUE" |html %]</td> > [% FOREACH loopcel IN loopro.loopcell %] >- <td>[% DEFAULT loopcel.value=" " %]</td> >+ <td>[% loopcel.value %]</td> > [% END %] > <td>[% loopro.totalrow %]</td> > </tr> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt >index f002650..6f5865b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt >@@ -46,11 +46,15 @@ > <th>TOTAL</th> > </tr> > [% FOREACH loopro IN mainloo.looprow %] >- <tr[% UNLESS ( loop.odd ) %] class="highlight"[% END %]> >- <td>[% DEFAULT loopro.rowtitle_display="UNKNOWN VALUE" |html %]</td> >+ [% IF ( loop.odd ) %] >+ <tr> >+ [% ELSE %] >+ <tr class="highlight"> >+ [% END %] >+ <td>[% loopro.rowtitle_display or "UNKNOWN VALUE" |html %]</td> > [% FOREACH loopcel IN loopro.loopcell %] > <td align="center"> >- [% IF ( loopcel.url_complement ) %]<a href="reserves_stats.pl?output=[% loopcel.output %]&[% loopcel.url_complement %]">[% DEFAULT loopcel.value=" " %]</a>[% ELSE %][% DEFAULT loopcel.value=" " %][% END %] >+ [% IF ( loopcel.url_complement ) %]<a href="reserves_stats.pl?output=[% loopcel.output %]&[% loopcel.url_complement %]">[% loopcel.value %]</a>[% ELSE %][% loopcel.value %][% END %] > </td> > [% END %] > <td align="center">[% loopro.totalrow %]</td> >diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/ilsdi.tt b/koha-tmpl/opac-tmpl/prog/en/modules/ilsdi.tt >index 765febc..3ba75d6 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/modules/ilsdi.tt >+++ b/koha-tmpl/opac-tmpl/prog/en/modules/ilsdi.tt >@@ -1,4 +1,4 @@ >-[% INCLUDE 'doc-head-open.inc' %][% DEFAULT LibraryNameTitle="Koha Online" %] › ILS-DI >+[% INCLUDE 'doc-head-open.inc' %][% LibraryNameTitle or "Koha Online" %] › ILS-DI > [% INCLUDE 'doc-head-close.inc' %] > </head> > <body> >diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tt >index 70aac88..2c097b5 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tt >+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tt >@@ -1,4 +1,4 @@ >-[% INCLUDE 'doc-head-open.inc' %][% DEFAULT LibraryNameTitle="Koha Online" %] Catalog › Account for [% firstname %] [% surname %] >+[% INCLUDE 'doc-head-open.inc' %][% LibraryNameTitle or "Koha Online" %] Catalog › Account for [% firstname %] [% surname %] > [% INCLUDE 'doc-head-close.inc' %] > <style type="text/css">ul.ui-tabs-nav li a, ul.ui-tabs-nav li span.a { padding:0.6em 1em; }</style> > <script type="text/javascript"> >diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt >index 6eabe6c..4d81a17 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt >+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt >@@ -1,4 +1,4 @@ >-[% INCLUDE 'doc-head-open.inc' %][% DEFAULT LibraryNameTitle="Koha Online" %] Catalog › Placing hold [% title |html %] for [% FOREACH USER_INF IN USER_INFO %][% USER_INF.firstname %] [% USER_INF.surname %][% END %] >+[% INCLUDE 'doc-head-open.inc' %][% LibraryNameTitle or "Koha Online" %] Catalog › Placing hold [% title |html %] for [% FOREACH USER_INF IN USER_INFO %][% USER_INF.firstname %] [% USER_INF.surname %][% END %] > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'calendar.inc' %] > <script type="text/javascript"> >diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-review.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-review.tt >index 3e69614..57d098e 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-review.tt >+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-review.tt >@@ -1,4 +1,4 @@ >-[% INCLUDE 'doc-head-open.inc' %][% DEFAULT LibraryNameTitle="Koha Online" %] Catalog › Comments on [% title %] >+[% INCLUDE 'doc-head-open.inc' %][% LibraryNameTitle or "Koha Online" %] Catalog › Comments on [% title %] > [% INCLUDE 'doc-head-close.inc' %] > <style type="text/css"> > #custom-doc { width:37.08em;*width:36.16em;min-width:485px; margin:1em auto; text-align:left; } >diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags.tt >index 564a149..e99d201 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags.tt >+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags.tt >@@ -77,7 +77,7 @@ > <h1>All Tags</h1> > > <form method="get" action="opac-tags.pl"> >- <fieldset>Show up to <input type="text" name="limit" style="text-align: right;" maxlength="4" size="4" value="[% DEFAULT limit="100" %]" /> >+ <fieldset>Show up to <input type="text" name="limit" style="text-align: right;" maxlength="4" size="4" value="[% limit or "100" %]" /> > tags[% IF ( opacuserlogin ) %] from other users[% END %]. > <input type="submit" value="OK" /> > [% IF ( opacuserlogin ) %][% UNLESS ( loggedinusername ) %] >diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags_subject.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags_subject.tt >index 5626b11..22c198a 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags_subject.tt >+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags_subject.tt >@@ -1,4 +1,4 @@ >-[% INCLUDE 'doc-head-open.inc' %][% DEFAULT LibraryNameTitle="Koha Online" %] Catalog › ISBD >+[% INCLUDE 'doc-head-open.inc' %][% LibraryNameTitle or "Koha Online" %] Catalog › ISBD > [% INCLUDE 'doc-head-close.inc' %] > </head> > <body id="opac-tags-subject"> >diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tt b/koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tt >index 678fe59..ddb6dfa 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tt >+++ b/koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tt >@@ -204,7 +204,7 @@ Sorry, This Self-Checkout Station has lost authentication. Please contact the a > <!-- FIXME: yet another jacket image breakpoint --> > <td>[% IF ( ISSUE.amazonimages ) %] [% IF ( ISSUE.isbn ) %]<a href="/cgi-bin/koha/opac-detail.pl?bib=[% ISSUE.biblionumber |url %]"><img src="http://images.amazon.com/images/P/[% ISSUE.isbn %].01.THUMBZZZ.jpg" alt="Book Cover Image" class="thumbnail" /></a>[% END %] [% END %][% UNLESS ( ISSUE.noitemlinks ) %]<a href="/cgi-bin/koha/opac-detail.pl?bib=[% ISSUE.biblionumber %]">[% ISSUE.title |html %]</a>[% ELSE %]<strong>[% ISSUE.title |html %]</strong>[% END %]<span class="item-details"> > [% ISSUE.author %]</span> ([% ISSUE.barcode %])</td> >- <td>[% DEFAULT ISSUE.itemcallnumber=" " %]</td> >+ <td>[% ISSUE.itemcallnumber %]</td> > [% IF ( ISSUE.overdue ) %]<td class="overdue">[% ISSUE.date_due_display %]</td>[% ELSE %]<td>[% ISSUE.date_due_display %]</td>[% END %] > <td> > <form action="/cgi-bin/koha/sco/sco-main.pl" method="post"> >-- >1.7.3 >
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 6640
:
4806
| 4828