Bug 16701: (follow-up) improve some changes

Add missing quote in line 152
Modify title of the page and breadcrumbs section wrong "searchfield" used
should be instead "currency.currency"

To test
-Try to delete the active and used currency, for example, my case
 USD, look that appear USD' with the initial single quote missing in
 message Confirm deletion of currency USD'
-Notice about the breadcrumbs section appear:
     Confirm deletion of currency ''
 Should appear the currency
-Try to delete another currency see the pharese look the same
-Notice about the title in both cases, there is missing the currency name
-Apply follow-up and re-test

Sing-off on followup
Signed-off-by: Marc Véron <veron@veron.ch>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
This commit is contained in:
Hector Castro 2016-07-07 09:13:30 -06:00 committed by Kyle M Hall
parent a83d75b6f2
commit 4f2dba105e
1 changed files with 3 additions and 3 deletions

View File

@ -3,7 +3,7 @@
[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Administration &rsaquo; Currencies &amp; Exchange rates &rsaquo;
[% IF op == 'add_form' %][% IF currency %]Modify currency '[% currency.currency %]'[% ELSE %]New currency[% END %][% END %]
[% IF op == 'delete_' %]Confirm deletion of currency '[% searchfield %]'[% END %]
[% IF op == 'delete_confirm' %]Confirm deletion of currency '[% currency.currency %]'[% END %]
[% IF op == 'list' %]Currencies[% END %]</title>
[% INCLUDE 'doc-head-close.inc' %]
<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" />
@ -49,7 +49,7 @@
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; <a href="/cgi-bin/koha/admin/currency.pl">Currencies &amp; Exchange rates</a> &rsaquo; [% IF op == 'add_form' %][% IF currency %]Modify currency '[% currency.currency %]'[% ELSE %]New currency[% END %][% END %]
[% IF op == 'delete_confirm' %]Confirm deletion of currency '[% '<span class="ex">' _ searchfield _ '</span>' %]'
[% IF op == 'delete_confirm' %]Confirm deletion of currency '[% '<span class="ex">' _ currency.currency _ '</span>' %]'
[% ELSIF op == 'list' %]Currencies
[% END %]
</div>
@ -149,7 +149,7 @@
[% IF op =='delete_confirm' %]
[% IF nb_of_orders or nb_of_vendors %]
<div class="dialog alert">
<h3>Cannot delete currency [% '<span class="ex">' _ currency.currency _ '</span>' %]'</h3>
<h3>Cannot delete currency '[% '<span class="ex">' _ currency.currency _ '</span>' %]'</h3>
<p>
[% IF nb_of_orders %]
This currency is used by [% nb_of_orders %] orders.