[MT2338] Fixed the missing content in the "active" column

diff --git a/admin/currency.pl b/admin/currency.pl
index 644b327..cb869e2 100755 (executable)
--- a/admin/currency.pl
+++ b/admin/currency.pl
@@ -165,11 +165,13 @@ if ($op eq 'add_form') {
     my $count = scalar(@$results);
     my @loop;
     for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
+        warn Data::Dumper::Dumper($results->[$i]);
         push @loop, {
-            currency => $results->[$i]{'currency'},
-                rate => $results->[$i]{'rate'},
-            symbol => $results->[$i]{'symbol'},
-        timestamp => format_date($results->[$i]{'timestamp'}),
+            currency  => $results->[$i]{'currency'},
+            rate      => $results->[$i]{'rate'},
+            symbol    => $results->[$i]{'symbol'},
+            timestamp => format_date($results->[$i]{'timestamp'}),
+            active    => $results->[$i]{'active'},
         };
     }
     $template->param(loop => \@loop);

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl
index 1b58a96..cb90468 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl
@@ -189,12 +189,7 @@
             <td><!-- TMPL_VAR NAME="rate" --></td>
             <td><!-- TMPL_VAR NAME="symbol" ESCAPE="HTML" --></td>
             <td><!-- TMPL_VAR NAME="timestamp" --></td>
-
-            <td><!-- TMPL_IF NAME="active" -->
-                <font COLOR="#00FF00">✓</font>
-                <!-- /TMPL_IF -->
-            </td>
-
+            <td style="color:green;"><!-- TMPL_IF NAME="active" -->✓<!-- /TMPL_IF --></td>
             <td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;searchfield=<!-- TMPL_VAR NAME="currency" -->">Edit</a></td>
             <td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&amp;searchfield=<!-- TMPL_VAR NAME="currency" -->">Delete</a></td>
         </tr>