Merge branch 'b-3.6.1' of ../kivitendo-erp_20220811

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

diff --git a/SL/Template/Plugin/L.pm b/SL/Template/Plugin/L.pm
index ff507d10792cd5c8510e363f03af6ecefb83ab85..abb6046936e536139b641f65976acd10b994405b 100644 (file)
--- a/SL/Template/Plugin/L.pm
+++ b/SL/Template/Plugin/L.pm
@@ -8,6 +8,8 @@ use List::Util qw(max);
 use Scalar::Util qw(blessed);
 
 use SL::Presenter;
 use Scalar::Util qw(blessed);
 
 use SL::Presenter;

+use SL::Presenter::ALL;
+use SL::Presenter::Simple;

 use SL::Util qw(_hashify);
 
 use strict;
 use SL::Util qw(_hashify);
 
 use strict;


@@ -50,95 +52,45 @@ sub _call_presenter {
 
   my $presenter              = $::request->presenter;
 
 
   my $presenter              = $::request->presenter;
 

-  if (!$presenter->can($method)) {
-    $::lxdebug->message(LXDebug::WARN(), "SL::Presenter has no method named '$method'!");
-    return '';
+  splice @args, -1, 1, %{ $args[-1] } if @args && (ref($args[-1]) eq 'HASH');
+
+  if (my $sub = SL::Presenter::Simple->can($method)) {
+    return $sub->(@args);

   }
 
   }
 

-  splice @args, -1, 1, %{ $args[-1] } if @args && (ref($args[-1]) eq 'HASH');
+  if ($presenter->can($method)) {
+    return $presenter->$method(@args);
+  }

 
 

-  $presenter->$method(@args);
+  $::lxdebug->message(LXDebug::WARN(), "SL::Presenter has no method named '$method'!");
+  return;

 }
 
 sub name_to_id    { return _call_presenter('name_to_id',    @_); }
 sub html_tag      { return _call_presenter('html_tag',      @_); }
 }
 
 sub name_to_id    { return _call_presenter('name_to_id',    @_); }
 sub html_tag      { return _call_presenter('html_tag',      @_); }

+sub hidden_tag    { return _call_presenter('hidden_tag',    @_); }

 sub select_tag    { return _call_presenter('select_tag',    @_); }
 sub select_tag    { return _call_presenter('select_tag',    @_); }

+sub checkbox_tag  { return _call_presenter('checkbox_tag',  @_); }

 sub input_tag     { return _call_presenter('input_tag',     @_); }
 sub input_tag     { return _call_presenter('input_tag',     @_); }

+sub javascript    { return _call_presenter('javascript',    @_); }

 sub truncate      { return _call_presenter('truncate',      @_); }
 sub simple_format { return _call_presenter('simple_format', @_); }
 sub truncate      { return _call_presenter('truncate',      @_); }
 sub simple_format { return _call_presenter('simple_format', @_); }

+sub button_tag               { return _call_presenter('button_tag',               @_); }
+sub submit_tag               { return _call_presenter('submit_tag',               @_); }
+sub ajax_submit_tag          { return _call_presenter('ajax_submit_tag',          @_); }
+sub link                     { return _call_presenter('link_tag',                 @_); }
+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 img_tag                  { return _call_presenter('img_tag',                  @_); }
+sub restricted_html          { return _call_presenter('restricted_html',          @_); }
+sub stripped_html            { return _call_presenter('stripped_html',            @_); }

 
 sub _set_id_attribute {
 
 sub _set_id_attribute {

-  my ($attributes, $name) = @_;
-  SL::Presenter::Tag::_set_id_attribute($attributes, $name);
-}
-
-sub img_tag {
-  my ($self, %options) = _hashify(1, @_);
-
-  $options{alt} ||= '';
-
-  return $self->html_tag('img', undef, %options);
-}
-
-sub textarea_tag {
-  my ($self, $name, $content, %attributes) = _hashify(3, @_);
-
-  _set_id_attribute(\%attributes, $name);
-  $attributes{rows}  *= 1; # required by standard
-  $attributes{cols}  *= 1; # required by standard
-  $content            = $content ? _H($content) : '';
-
-  return $self->html_tag('textarea', $content, %attributes, name => $name);
-}
-
-sub checkbox_tag {
-  my ($self, $name, %attributes) = _hashify(2, @_);
-
-  _set_id_attribute(\%attributes, $name);
-  $attributes{value}   = 1 unless defined $attributes{value};
-  my $label            = delete $attributes{label};
-  my $checkall         = delete $attributes{checkall};
-
-  if ($attributes{checked}) {
-    $attributes{checked} = 'checked';
-  } else {
-    delete $attributes{checked};
-  }
-
-  my $code  = $self->html_tag('input', undef,  %attributes, name => $name, type => 'checkbox');
-  $code    .= $self->html_tag('label', $label, for => $attributes{id}) if $label;
-  $code    .= $self->javascript(qq|\$('#$attributes{id}').checkall('$checkall');|) if $checkall;
-
-  return $code;
-}
-
-sub radio_button_tag {
-  my ($self, $name, %attributes) = _hashify(2, @_);
-
-  _set_id_attribute(\%attributes, $name);
-  $attributes{value}   = 1 unless exists $attributes{value};
-  my $label            = delete $attributes{label};
-
-  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 hidden_tag {
-  my ($self, $name, $value, %attributes) = _hashify(3, @_);
-  return $self->input_tag($name, $value, %attributes, type => 'hidden');
-}
-
-sub div_tag {
-  my ($self, $content, @slurp) = @_;
-  return $self->html_tag('div', $content, @slurp);
+  my ($attributes, $name, $unique) = @_;
+  SL::Presenter::Tag::_set_id_attribute($attributes, $name, $unique);

 }
 
 sub ul_tag {
 }
 
 sub ul_tag {


@@ -151,56 +103,12 @@ sub li_tag {
   return $self->html_tag('li', $content, @slurp);
 }
 
   return $self->html_tag('li', $content, @slurp);
 }
 

-sub link {
-  my ($self, $href, $content, %params) = _hashify(3, @_);
-
-  $href ||= '#';
-
-  return $self->html_tag('a', $content, %params, href => $href);
-}
-
-sub submit_tag {
-  my ($self, $name, $value, %attributes) = _hashify(3, @_);
-
-  if ( $attributes{confirm} ) {
-    $attributes{onclick} = 'return confirm("'. _J(delete($attributes{confirm})) .'");';
-  }
-
-  return $self->input_tag($name, $value, %attributes, type => 'submit', class => 'submit');
-}
-
-sub button_tag {
-  my ($self, $onclick, $value, %attributes) = _hashify(3, @_);
-
-  _set_id_attribute(\%attributes, $attributes{name}) if $attributes{name};
-  $attributes{type} ||= 'button';
-
-  $onclick = 'if (!confirm("'. _J(delete($attributes{confirm})) .'")) return false; ' . $onclick if $attributes{confirm};
-
-  return $self->html_tag('input', undef, %attributes, value => $value, onclick => $onclick);
-}
-
-sub ajax_submit_tag {
-  my ($self, $url, $form_selector, $text, @slurp) = @_;
-
-  $url           = _J($url);
-  $form_selector = _J($form_selector);
-  my $onclick    = qq|kivi.submit_ajax_form('${url}', '${form_selector}')|;
-
-  return $self->button_tag($onclick, $text, @slurp);
-}
-

 sub yes_no_tag {
   my ($self, $name, $value, %attributes) = _hashify(3, @_);
 
   return $self->select_tag($name, [ [ 1 => $::locale->text('Yes') ], [ 0 => $::locale->text('No') ] ], default => $value ? 1 : 0, %attributes);
 }
 
 sub yes_no_tag {
   my ($self, $name, $value, %attributes) = _hashify(3, @_);
 
   return $self->select_tag($name, [ [ 1 => $::locale->text('Yes') ], [ 0 => $::locale->text('No') ] ], default => $value ? 1 : 0, %attributes);
 }
 

-sub javascript {
-  my ($self, $data) = @_;
-  return $self->html_tag('script', $data, type => 'text/javascript');
-}
-

 sub stylesheet_tag {
   my $self = shift;
   my $code = '';
 sub stylesheet_tag {
   my $self = shift;
   my $code = '';


@@ -215,36 +123,10 @@ sub stylesheet_tag {
   return $code;
 }
 
   return $code;
 }
 

-my $date_tag_id_idx = 0;
-sub date_tag {
-  my ($self, $name, $value, %params) = _hashify(3, @_);
-
-  _set_id_attribute(\%params, $name);
-  my @onchange = $params{onchange} ? (onChange => delete $params{onchange}) : ();
-  my @class    = $params{no_cal} || $params{readonly} ? () : (class => 'datepicker');
-
-  return $self->input_tag(
-    $name, blessed($value) ? $value->to_lxoffice : $value,
-    size   => 11,
-    onblur => "check_right_date_format(this);",
-    %params,
-    @class, @onchange,
-  );
-}
-
-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("$name_e\_name", (ref $value && $value->can('name')) ? $value->name : '', %params);
-}

 
 # simple version with select_tag
 sub vendor_selector {
 
 # 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 : '';
 
   my $actual_vendor_id = (defined $::form->{"$name"})? ((ref $::form->{"$name"}) ? $::form->{"$name"}->id : $::form->{"$name"}) :
                          (ref $value && $value->can('id')) ? $value->id : '';


@@ -259,7 +141,7 @@ sub vendor_selector {
 
 # simple version with select_tag
 sub part_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 : '';
 
   my $actual_part_id = (defined $::form->{"$name"})? ((ref $::form->{"$name"})? $::form->{"$name"}->id : $::form->{"$name"}) :
                        (ref $value && $value->can('id')) ? $value->id : '';


@@ -336,19 +218,20 @@ sub tab {
 sub areainput_tag {
   my ($self, $name, $value, %attributes) = _hashify(3, @_);
 
 sub areainput_tag {
   my ($self, $name, $value, %attributes) = _hashify(3, @_);
 

-  my ($rows, $cols);
-  my $min  = delete $attributes{min_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);

 
 

-  if (exists $attributes{cols}) {
-    $cols = delete $attributes{cols};
-    $rows = $::form->numtextrows($value, $cols);
-  } else {
-    $rows = delete $attributes{rows} || 1;
-  }
+  $attributes{id} ||= _tag_id();
+  my $id            = $attributes{id};

 
 

-  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) : ()));
+  return $self->textarea_tag($name, $value, %attributes, rows => $rows, cols => $cols) if $rows > 1;
+
+  return '<span>'
+    . $self->input_tag($name, $value, %attributes, size => $cols)
+    . "<img src=\"image/edit-entry.png\" onclick=\"kivi.switch_areainput_to_textarea('${id}')\" style=\"margin-left: 2px;\">"
+    . '</span>';

 }
 
 sub multiselect2side {
 }
 
 sub multiselect2side {


@@ -391,9 +274,13 @@ JAVASCRIPT
     $filter    .= ".map(function(idx, str) { return str.replace('$params{with}_', ''); })";
 
     my $params_js = $params{params} ? qq| + ($params{params})| : '';
     $filter    .= ".map(function(idx, str) { return str.replace('$params{with}_', ''); })";
 
     my $params_js = $params{params} ? qq| + ($params{params})| : '';

+    my $ajax_return = '';
+    if ($params{ajax_return}) {
+      $ajax_return = 'kivi.eval_json_result';
+    }

 
     $stop_event = <<JAVASCRIPT;
 
     $stop_event = <<JAVASCRIPT;

-        \$.post('$params{url}'${params_js}, { '${as}[]': \$(\$('${selector}').sortable('toArray'))${filter}.toArray() });
+        \$.post('$params{url}'${params_js}, { '${as}[]': \$(\$('${selector}').sortable('toArray'))${filter}.toArray() }, $ajax_return);

 JAVASCRIPT
   }
 
 JAVASCRIPT
   }
 


@@ -429,17 +316,6 @@ JAVASCRIPT
   return $code;
 }
 
   return $code;
 }
 

-sub online_help_tag {
-  my ($self, $tag, %params) = _hashify(2, @_);
-  my $cc                   = $::myconfig{countrycode};
-  my $file                 = "doc/online/$cc/$tag.html";
-  my $text                 = $params{text} || $::locale->text('Help');
-
-  die 'malformed help tag' unless $tag =~ /^[a-zA-Z0-9_]+$/;
-  return unless -f $file;
-  return $self->html_tag('a', $text, href => $file, class => 'jqModal')
-}
-

 sub dump {
   my $self = shift;
   return '<pre>' . Data::Dumper::Dumper(@_) . '</pre>';
 sub dump {
   my $self = shift;
   return '<pre>' . Data::Dumper::Dumper(@_) . '</pre>';


@@ -449,39 +325,43 @@ sub sortable_table_header {
   my ($self, $by, %params) = _hashify(2, @_);
 
   my $controller          = $self->{CONTEXT}->stash->get('SELF');
   my ($self, $by, %params) = _hashify(2, @_);
 
   my $controller          = $self->{CONTEXT}->stash->get('SELF');

-  my $sort_spec           = $controller->get_sort_spec;
+  my $models              = $params{models} || $self->{CONTEXT}->stash->get('MODELS');
+  my $sort_spec           = $models->get_sort_spec;

   my $by_spec             = $sort_spec->{$by};
   my $by_spec             = $sort_spec->{$by};

-  my %current_sort_params = $controller->get_current_sort_params;
+  my %current_sort_params = $models->get_current_sort_params;

   my ($image, $new_dir)   = ('', $current_sort_params{dir});
   my $title               = delete($params{title}) || $::locale->text($by_spec->{title});
 
   my ($image, $new_dir)   = ('', $current_sort_params{dir});
   my $title               = delete($params{title}) || $::locale->text($by_spec->{title});
 

-  if ($current_sort_params{by} eq $by) {
-    my $current_dir = $current_sort_params{dir} ? 'up' : 'down';
+  if ($current_sort_params{sort_by} eq $by) {
+    my $current_dir = $current_sort_params{sort_dir} ? 'up' : 'down';

     $image          = '<img border="0" src="image/' . $current_dir . '.png">';
     $image          = '<img border="0" src="image/' . $current_dir . '.png">';

-    $new_dir        = 1 - ($current_sort_params{dir} || 0);
+    $new_dir        = 1 - ($current_sort_params{sort_dir} || 0);

   }
 
   }
 

-  $params{ $sort_spec->{FORM_PARAMS}->[0] } = $by;
-  $params{ $sort_spec->{FORM_PARAMS}->[1] } = ($new_dir ? '1' : '0');
+  $params{ $models->sorted->form_params->[0] } = $by;
+  $params{ $models->sorted->form_params->[1] } = ($new_dir ? '1' : '0');

 
 

-  return '<a href="' . $controller->get_callback(%params) . '">' . _H($title) . $image . '</a>';
+  return '<a href="' . $models->get_callback(%params) . '">' . _H($title) . $image . '</a>';

 }
 
 sub paginate_controls {
   my ($self, %params) = _hashify(1, @_);
 
   my $controller      = $self->{CONTEXT}->stash->get('SELF');
 }
 
 sub paginate_controls {
   my ($self, %params) = _hashify(1, @_);
 
   my $controller      = $self->{CONTEXT}->stash->get('SELF');

-  my $paginate_spec   = $controller->get_paginate_spec;
-  my %paginate_params = $controller->get_current_paginate_params;
+  my $models          = $params{models} || $self->{CONTEXT}->stash->get('MODELS');
+  my $pager           = $models->paginated;
+#  my $paginate_spec   = $controller->get_paginate_spec;
+
+  my %paginate_params = $models->get_paginate_args;

 
   my %template_params = (
     pages             => \%paginate_params,
     url_maker         => sub {
       my %url_params                                    = _hashify(0, @_);
 
   my %template_params = (
     pages             => \%paginate_params,
     url_maker         => sub {
       my %url_params                                    = _hashify(0, @_);

-      $url_params{ $paginate_spec->{FORM_PARAMS}->[0] } = delete $url_params{page};
-      $url_params{ $paginate_spec->{FORM_PARAMS}->[1] } = delete $url_params{per_page} if exists $url_params{per_page};
+      $url_params{ $pager->form_params->[0] } = delete $url_params{page};
+      $url_params{ $pager->form_params->[1] } = delete $url_params{per_page} if exists $url_params{per_page};

 
 

-      return $controller->get_callback(%url_params);
+      return $models->get_callback(%url_params);

     },
     %params,
   );
     },
     %params,
   );


@@ -546,8 +426,14 @@ The following functions are just forwarded to L<SL::Presenter::Tag>:
 
 =item * C<input_tag $name, $value, %attributes>
 
 
 =item * C<input_tag $name, $value, %attributes>
 

+=item * C<hidden_tag $name, $value, %attributes>
+
+=item * C<checkbox_tag $name, %attributes>
+

 =item * C<select_tag $name, \@collection, %attributes>
 
 =item * C<select_tag $name, \@collection, %attributes>
 

+=item * C<link $href, $content, %attributes>
+

 =back
 
 Available high-level functions implemented in this module:
 =back
 
 Available high-level functions implemented in this module:


@@ -561,77 +447,17 @@ calling L<select_tag>. C<$value> determines
 which entry is selected. The C<%attributes> are passed through to
 L<select_tag>.
 
 which entry is selected. The C<%attributes> are passed through to
 L<select_tag>.
 

-=item C<hidden_tag $name, $value, %attributes>
-
-Creates a HTML 'input type=hidden' tag named C<$name> with the value
-C<$value> and with arbitrary HTML attributes from C<%attributes>. The
-tag's C<id> defaults to C<name_to_id($name)>.
-
-=item C<submit_tag $name, $value, %attributes>
-
-Creates a HTML 'input type=submit class=submit' tag named C<$name> with the
-value C<$value> and with arbitrary HTML attributes from C<%attributes>. The
-tag's C<id> defaults to C<name_to_id($name)>.
-
-If C<$attributes{confirm}> is set then a JavaScript popup dialog will
-be added via the C<onclick> handler asking the question given with
-C<$attributes{confirm}>. The request is only submitted if the user
-clicks the dialog's ok/yes button.
-
-=item C<ajax_submit_tag $url, $form_selector, $text, %attributes>
-
-Creates a HTML 'input type="button"' tag with a very specific onclick
-handler that submits the form given by the jQuery selector
-C<$form_selector> to the URL C<$url> (the actual JavaScript function
-called for that is C<kivi.submit_ajax_form()> in
-C<js/client_js.js>). The button's label will be C<$text>.
-
-=item C<button_tag $onclick, $text, %attributes>
-
-Creates a HTML 'input type="button"' tag with an onclick handler
-C<$onclick> and a value of C<$text>. The button does not have a name
-nor an ID by default.
-
-If C<$attributes{confirm}> is set then a JavaScript popup dialog will
-be prepended to the C<$onclick> handler asking the question given with
-C<$attributes{confirm}>. The request is only submitted if the user
-clicks the dialog's "ok/yes" button.
-

 =item C<textarea_tag $name, $value, %attributes>
 
 Creates a HTML 'textarea' tag named C<$name> with the content
 C<$value> and with arbitrary HTML attributes from C<%attributes>. The
 tag's C<id> defaults to C<name_to_id($name)>.
 
 =item C<textarea_tag $name, $value, %attributes>
 
 Creates a HTML 'textarea' tag named C<$name> with the content
 C<$value> and with arbitrary HTML attributes from C<%attributes>. The
 tag's C<id> defaults to C<name_to_id($name)>.
 

-=item C<checkbox_tag $name, %attributes>
-
-Creates a HTML 'input type=checkbox' tag named C<$name> with arbitrary
-HTML attributes from C<%attributes>. The tag's C<id> defaults to
-C<name_to_id($name)>. The tag's C<value> defaults to C<1>.
-
-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.
-
-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<date_tag $name, $value, %attributes>
 
 Creates a date input field, with an attached javascript that will open a
 calendar on click.
 
 =item C<date_tag $name, $value, %attributes>
 
 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>'
 =item C<javascript_tag $file1, $file2, $file3...>
 
 Creates a HTML 'E<lt>script type="text/javascript" src="..."E<gt>'


@@ -704,9 +530,13 @@ C<%params> can contain the following entries:
 =item C<url>
 
 The URL to POST an AJAX request to after a dragged element has been
 =item C<url>
 
 The URL to POST an AJAX request to after a dragged element has been

-dropped. The AJAX request's return value is ignored. If given then
+dropped. The AJAX request's return value is ignored by default. If given then

 C<$params{with}> must be given as well.
 
 C<$params{with}> must be given as well.
 

+=item C<ajax_return>
+
+If trueish then the AJAX request's return is accepted.
+

 =item C<with>
 
 A string that is interpreted as the prefix of the children's ID. Upon
 =item C<with>
 
 A string that is interpreted as the prefix of the children's ID. Upon