Merge branch 'master' of vc.linet-services.de:public/lx-office-erp

[mfinanz.git] / SL / Template / Plugin / L.pm

diff --git a/SL/Template/Plugin/L.pm b/SL/Template/Plugin/L.pm
index c25941cbca40a89d7958a16a0201460b69c9ef7d..c590082cf21e17b3fff254262bc634a997de35bd 100644 (file)
--- a/SL/Template/Plugin/L.pm
+++ b/SL/Template/Plugin/L.pm
@@ -111,6 +111,8 @@ sub select_tag {
   my $title_sub       = delete($attributes{title_sub});
   my $default_sub     = delete($attributes{default_sub});
 
+  my $with_empty      = delete($attributes{with_empty});
+  my $empty_title     = delete($attributes{empty_title});
 
   my %selected;
 
@@ -128,8 +130,8 @@ sub select_tag {
 
   my @options;
 
-  if ( delete($attributes{with_empty}) ) {
-    push(@options, [undef, $attributes{empty_title} || '']);
+  if ( $with_empty ) {
+    push(@options, [undef, $empty_title || '']);
   }
 
   my $normalize_entry = sub {
@@ -180,7 +182,7 @@ sub select_tag {
     my $title;
 
     if ( $value_title_sub ) {
-      ($value, $title) = $value_title_sub->($entry);
+      ($value, $title) = @{ $value_title_sub->($entry) };
     } else {
 
       $value = $normalize_entry->('value', $entry, $value_sub, $value_key);
@@ -687,11 +689,7 @@ sub paginate_controls {
   my %paginate_params = $controller->get_current_paginate_params;
 
   my %template_params = (
-    pages             => {
-      cur             => $paginate_params{page},
-      max             => $paginate_params{num_pages},
-      common          => $paginate_params{common_pages},
-    },
+    pages             => \%paginate_params,
     url_maker         => sub {
       my %url_params                                    = _hashify(@_);
       $url_params{ $paginate_spec->{FORM_PARAMS}->[0] } = delete $url_params{page};