X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FTemplate%2FPlugin%2FL.pm;h=7916b782a8e1846cb0945c44bf296cf75c7e057f;hb=a44b04878198d94a18adf3867c4ba227a0d9d3ff;hp=0b0c760ec661a2d94591f1c60e006029ff4367ab;hpb=99d0bd2b810d7d4268c104d0a0ea8e67a63b55d2;p=kivitendo-erp.git
diff --git a/SL/Template/Plugin/L.pm b/SL/Template/Plugin/L.pm
index 0b0c760ec..7916b782a 100644
--- 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 SL::Presenter::ALL;
+use SL::Presenter::Simple;
use SL::Util qw(_hashify);
use strict;
@@ -50,14 +52,18 @@ sub _call_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', @_); }
@@ -69,14 +75,14 @@ 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 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 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', @_); }
+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 _set_id_attribute {
my ($attributes, $name, $unique) = @_;
@@ -91,17 +97,6 @@ sub img_tag {
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 radio_button_tag {
my ($self, $name, %attributes) = _hashify(2, @_);
@@ -124,11 +119,6 @@ sub radio_button_tag {
return $code;
}
-sub div_tag {
- my ($self, $content, @slurp) = @_;
- return $self->html_tag('div', $content, @slurp);
-}
-
sub ul_tag {
my ($self, $content, @slurp) = @_;
return $self->html_tag('ul', $content, @slurp);
@@ -159,26 +149,6 @@ sub stylesheet_tag {
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 @classes = $params{no_cal} || $params{readonly} ? () : ('datepicker');
- push @classes, delete($params{class}) if $params{class};
- my %class = @classes ? (class => join(' ', @classes)) : ();
-
- $::request->presenter->need_reinit_widgets($params{id});
-
- return $self->input_tag(
- $name, blessed($value) ? $value->to_lxoffice : $value,
- size => 11,
- onchange => "check_right_date_format(this);",
- %params,
- %class, @onchange,
- );
-}
# simple version with select_tag
sub vendor_selector {
@@ -279,9 +249,15 @@ sub areainput_tag {
my $maxrows = delete $attributes{max_rows};
my $rows = $::form->numtextrows($value, $cols, $maxrows, $minrows);
- return $rows > 1
- ? $self->textarea_tag($name, $value, %attributes, rows => $rows, cols => $cols)
- : $self->input_tag($name, $value, %attributes, size => $cols);
+ $attributes{id} ||= _tag_id();
+ my $id = $attributes{id};
+
+ return $self->textarea_tag($name, $value, %attributes, rows => $rows, cols => $cols) if $rows > 1;
+
+ return ''
+ . $self->input_tag($name, $value, %attributes, size => $cols)
+ . "
"
+ . '';
}
sub multiselect2side {
@@ -324,9 +300,13 @@ JAVASCRIPT
$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 = < can contain the following entries:
=item C
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.
+=item C
+
+If trueish then the AJAX request's return is accepted.
+
=item C
A string that is interpreted as the prefix of the children's ID. Upon