X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FTemplate%2FPlugin%2FL.pm;h=48960097ab0f15cfcd2b31f637c9c794b08e35f8;hb=23bbb82973bcaac52efd7eb1609801c11a8970f3;hp=241141625f1984caa9d99286e2cc14bb1156c797;hpb=a31ce8afd1c05d8ac178a84660f10068359dc5ad;p=kivitendo-erp.git

diff --git a/SL/Template/Plugin/L.pm b/SL/Template/Plugin/L.pm
index 241141625..48960097a 100644
--- a/SL/Template/Plugin/L.pm
+++ b/SL/Template/Plugin/L.pm
@@ -67,10 +67,13 @@ sub input_tag     { return _call_presenter('input_tag',     @_); }
 sub truncate      { return _call_presenter('truncate',      @_); }
 sub simple_format { return _call_presenter('simple_format', @_); }
 sub part_picker   { return _call_presenter('part_picker',   @_); }
+sub chart_picker  { return _call_presenter('chart_picker',  @_); }
+sub customer_vendor_picker   { return _call_presenter('customer_vendor_picker',   @_); }
+sub project_picker           { return _call_presenter('project_picker',           @_); }
 
 sub _set_id_attribute {
-  my ($attributes, $name) = @_;
-  SL::Presenter::Tag::_set_id_attribute($attributes, $name);
+  my ($attributes, $name, $unique) = @_;
+  SL::Presenter::Tag::_set_id_attribute($attributes, $name, $unique);
 }
 
 sub img_tag {
@@ -119,10 +122,13 @@ sub checkbox_tag {
 sub radio_button_tag {
   my ($self, $name, %attributes) = _hashify(2, @_);
 
-  _set_id_attribute(\%attributes, $name);
   $attributes{value}   = 1 unless exists $attributes{value};
+
+  _set_id_attribute(\%attributes, $name, 1);
   my $label            = delete $attributes{label};
 
+  _set_id_attribute(\%attributes, $name . '_' . $attributes{value});
+
   if ($attributes{checked}) {
     $attributes{checked} = 'checked';
   } else {
@@ -240,19 +246,9 @@ sub date_tag {
   );
 }
 
-sub customer_picker {
-  my ($self, $name, $value, %params) = @_;
-  my $name_e    = _H($name);
-
-  $::request->{layout}->add_javascripts('autocomplete_customer.js');
-
-  $self->hidden_tag($name, (ref $value && $value->can('id') ? $value->id : ''), class => 'customer_autocomplete') .
-  $self->input_tag('', (ref $value && $value->can('name')) ? $value->name : '', id => $self->name_to_id("$name_e\_name"), %params);
-}
-
 # simple version with select_tag
 sub vendor_selector {
-  my ($self, $name, $value, %params) = @_;
+  my ($self, $name, $value, %params) = _hashify(3, @_);
 
   my $actual_vendor_id = (defined $::form->{"$name"})? ((ref $::form->{"$name"}) ? $::form->{"$name"}->id : $::form->{"$name"}) :
                          (ref $value && $value->can('id')) ? $value->id : '';
@@ -267,7 +263,7 @@ sub vendor_selector {
 
 # simple version with select_tag
 sub part_selector {
-  my ($self, $name, $value, %params) = @_;
+  my ($self, $name, $value, %params) = _hashify(3, @_);
 
   my $actual_part_id = (defined $::form->{"$name"})? ((ref $::form->{"$name"})? $::form->{"$name"}->id : $::form->{"$name"}) :
                        (ref $value && $value->can('id')) ? $value->id : '';
@@ -344,19 +340,14 @@ sub tab {
 sub areainput_tag {
   my ($self, $name, $value, %attributes) = _hashify(3, @_);
 
-  my ($rows, $cols);
-  my $min  = delete $attributes{min_rows} || 1;
-
-  if (exists $attributes{cols}) {
-    $cols = delete $attributes{cols};
-    $rows = $::form->numtextrows($value, $cols);
-  } else {
-    $rows = delete $attributes{rows} || 1;
-  }
+  my $cols    = delete $attributes{cols} || delete $attributes{size};
+  my $minrows = delete $attributes{min_rows} || 1;
+  my $maxrows = delete $attributes{max_rows};
+  my $rows    = $::form->numtextrows($value, $cols, $maxrows, $minrows);
 
   return $rows > 1
-    ? $self->textarea_tag($name, $value, %attributes, rows => max($rows, $min), ($cols ? (cols => $cols) : ()))
-    : $self->input_tag($name, $value, %attributes, ($cols ? (size => $cols) : ()));
+    ? $self->textarea_tag($name, $value, %attributes, rows => $rows, cols => $cols)
+    : $self->input_tag($name, $value, %attributes, size => $cols);
 }
 
 sub multiselect2side {