From: Bernd Bleßmann <bernd@kivitendo-premium.de>
Date: Mon, 15 Apr 2019 09:07:35 +0000 (+0200)
Subject: Presenter::Tag: radio_button_tag aus Plugin/L verschoben
X-Git-Tag: kivitendo-mebil_0.1-0~9^2~463
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=94ca5d5182fbe9e07ac9217f191751a156bd230f;p=kivitendo-erp.git

Presenter::Tag: radio_button_tag aus Plugin/L verschoben
---

diff --git a/SL/Presenter/Tag.pm b/SL/Presenter/Tag.pm
index 8929dc5e2..ab4586546 100644
--- a/SL/Presenter/Tag.pm
+++ b/SL/Presenter/Tag.pm
@@ -11,7 +11,7 @@ our @EXPORT_OK = qw(
   html_tag input_tag hidden_tag javascript man_days_tag name_to_id select_tag
   checkbox_tag button_tag submit_tag ajax_submit_tag input_number_tag
   stringify_attributes restricted_html textarea_tag link_tag date_tag
-  div_tag);
+  div_tag radio_button_tag);
 our %EXPORT_TAGS = (ALL => \@EXPORT_OK);
 
 use Carp;
@@ -259,6 +259,28 @@ sub checkbox_tag {
   return $code;
 }
 
+sub radio_button_tag {
+  my ($name, %attributes) = @_;
+
+  $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 {
+    delete $attributes{checked};
+  }
+
+  my $code  = html_tag('input', undef,  %attributes, name => $name, type => 'radio');
+  $code    .= html_tag('label', $label, for => $attributes{id}) if $label;
+
+  return $code;
+}
+
 sub button_tag {
   my ($onclick, $value, %attributes) = @_;
 
@@ -540,6 +562,16 @@ If C<%attributes> contains a key C<checkall> then the value is taken as a
 JQuery selector and clicking this checkbox will also toggle all checkboxes
 matching the selector.
 
+=item C<radio_button_tag $name, %attributes>
+
+Creates a HTML 'input type=radio' tag named C<$name> with arbitrary
+HTML attributes from C<%attributes>. The tag's C<value> defaults to
+C<1>. The tag's C<id> defaults to C<name_to_id($name . "_" . $value)>.
+
+If C<%attributes> contains a key C<label> then a HTML 'label' tag is
+created with said C<label>. No attribute named C<label> is created in
+that case.
+
 =item C<select_tag $name, \@collection, %attributes>
 
 Creates an HTML 'select' tag named C<$name> with the contents of one
diff --git a/SL/Template/Plugin/L.pm b/SL/Template/Plugin/L.pm
index 7916b782a..b88f7b9fe 100644
--- a/SL/Template/Plugin/L.pm
+++ b/SL/Template/Plugin/L.pm
@@ -83,6 +83,7 @@ sub input_number_tag         { return _call_presenter('input_number_tag',
 sub textarea_tag             { return _call_presenter('textarea_tag',             @_); }
 sub date_tag                 { return _call_presenter('date_tag',                 @_); }
 sub div_tag                  { return _call_presenter('div_tag',                  @_); }
+sub radio_button_tag         { return _call_presenter('radio_button_tag',         @_); }
 
 sub _set_id_attribute {
   my ($attributes, $name, $unique) = @_;
@@ -97,28 +98,6 @@ sub img_tag {
   return $self->html_tag('img', undef, %options);
 }
 
-sub radio_button_tag {
-  my ($self, $name, %attributes) = _hashify(2, @_);
-
-  $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 {
-    delete $attributes{checked};
-  }
-
-  my $code  = $self->html_tag('input', undef,  %attributes, name => $name, type => 'radio');
-  $code    .= $self->html_tag('label', $label, for => $attributes{id}) if $label;
-
-  return $code;
-}
-
 sub ul_tag {
   my ($self, $content, @slurp) = @_;
   return $self->html_tag('ul', $content, @slurp);
@@ -484,16 +463,6 @@ tag's C<id> defaults to C<name_to_id($name)>.
 Creates a date input field, with an attached javascript that will open a
 calendar on click.
 
-=item C<radio_button_tag $name, %attributes>
-
-Creates a HTML 'input type=radio' tag named C<$name> with arbitrary
-HTML attributes from C<%attributes>. The tag's C<value> defaults to
-C<1>. The tag's C<id> defaults to C<name_to_id($name . "_" . $value)>.
-
-If C<%attributes> contains a key C<label> then a HTML 'label' tag is
-created with said C<label>. No attribute named C<label> is created in
-that case.
-
 =item C<javascript_tag $file1, $file2, $file3...>
 
 Creates a HTML 'E<lt>script type="text/javascript" src="..."E<gt>'