X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FTemplate%2FPlugin%2FL.pm;h=48960097ab0f15cfcd2b31f637c9c794b08e35f8;hb=23bbb82973bcaac52efd7eb1609801c11a8970f3;hp=1ffe22d0e8bc558d0e72384d4e35bc362aa264cf;hpb=86a76ea5ef69b72b777298ca2335e980a216f377;p=kivitendo-erp.git diff --git a/SL/Template/Plugin/L.pm b/SL/Template/Plugin/L.pm index 1ffe22d0e..48960097a 100644 --- a/SL/Template/Plugin/L.pm +++ b/SL/Template/Plugin/L.pm @@ -2,11 +2,13 @@ package SL::Template::Plugin::L; use base qw( Template::Plugin ); use Template::Plugin; +use Data::Dumper; use List::MoreUtils qw(apply); use List::Util qw(max); use Scalar::Util qw(blessed); use SL::Presenter; +use SL::Util qw(_hashify); use strict; @@ -30,10 +32,6 @@ sub _J { return $string; } -sub _hashify { - return (@_ && (ref($_[0]) eq 'HASH')) ? %{ $_[0] } : @_; -} - sub new { my ($class, $context, @args) = @_; @@ -68,10 +66,18 @@ sub select_tag { return _call_presenter('select_tag', @_); } 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, $unique) = @_; + SL::Presenter::Tag::_set_id_attribute($attributes, $name, $unique); +} sub img_tag { - my ($self, @slurp) = @_; - my %options = _hashify(@slurp); + my ($self, %options) = _hashify(1, @_); $options{alt} ||= ''; @@ -79,10 +85,9 @@ sub img_tag { } sub textarea_tag { - my ($self, $name, $content, @slurp) = @_; - my %attributes = _hashify(@slurp); + my ($self, $name, $content, %attributes) = _hashify(3, @_); - $attributes{id} ||= $self->name_to_id($name); + _set_id_attribute(\%attributes, $name); $attributes{rows} *= 1; # required by standard $attributes{cols} *= 1; # required by standard $content = $content ? _H($content) : ''; @@ -91,13 +96,13 @@ sub textarea_tag { } sub checkbox_tag { - my ($self, $name, @slurp) = @_; - my %attributes = _hashify(@slurp); + my ($self, $name, %attributes) = _hashify(2, @_); - $attributes{id} ||= $self->name_to_id($name); + _set_id_attribute(\%attributes, $name); $attributes{value} = 1 unless defined $attributes{value}; my $label = delete $attributes{label}; my $checkall = delete $attributes{checkall}; + my $for_submit = delete $attributes{for_submit}; if ($attributes{checked}) { $attributes{checked} = 'checked'; @@ -105,7 +110,9 @@ sub checkbox_tag { delete $attributes{checked}; } - my $code = $self->html_tag('input', undef, %attributes, name => $name, type => 'checkbox'); + my $code = ''; + $code .= $self->hidden_tag($name, 0, %attributes, id => $attributes{id} . '_hidden') if $for_submit; + $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; @@ -113,14 +120,15 @@ sub checkbox_tag { } sub radio_button_tag { - my $self = shift; - my $name = shift; - my %attributes = _hashify(@_); + my ($self, $name, %attributes) = _hashify(2, @_); - $attributes{value} = 1 unless defined $attributes{value}; - $attributes{id} ||= $self->name_to_id($name . "_" . $attributes{value}); + $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 { @@ -134,8 +142,8 @@ sub radio_button_tag { } sub hidden_tag { - my ($self, $name, $value, @slurp) = @_; - return $self->input_tag($name, $value, _hashify(@slurp), type => 'hidden'); + my ($self, $name, $value, %attributes) = _hashify(3, @_); + return $self->input_tag($name, $value, %attributes, type => 'hidden'); } sub div_tag { @@ -154,8 +162,7 @@ sub li_tag { } sub link { - my ($self, $href, $content, @slurp) = @_; - my %params = _hashify(@slurp); + my ($self, $href, $content, %params) = _hashify(3, @_); $href ||= '#'; @@ -163,8 +170,7 @@ sub link { } sub submit_tag { - my ($self, $name, $value, @slurp) = @_; - my %attributes = _hashify(@slurp); + my ($self, $name, $value, %attributes) = _hashify(3, @_); if ( $attributes{confirm} ) { $attributes{onclick} = 'return confirm("'. _J(delete($attributes{confirm})) .'");'; @@ -174,10 +180,9 @@ sub submit_tag { } sub button_tag { - my ($self, $onclick, $value, @slurp) = @_; - my %attributes = _hashify(@slurp); + my ($self, $onclick, $value, %attributes) = _hashify(3, @_); - $attributes{id} ||= $self->name_to_id($attributes{name}) if $attributes{name}; + _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}; @@ -190,14 +195,13 @@ sub ajax_submit_tag { $url = _J($url); $form_selector = _J($form_selector); - my $onclick = qq|submit_ajax_form('${url}', '${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) = splice @_, 0, 3; - my %attributes = _hashify(@_); + 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); } @@ -223,36 +227,28 @@ sub stylesheet_tag { my $date_tag_id_idx = 0; sub date_tag { - my ($self, $name, $value, @slurp) = @_; + my ($self, $name, $value, %params) = _hashify(3, @_); - my %params = _hashify(@slurp); - my $id = $self->name_to_id($name) . _tag_id(); + _set_id_attribute(\%params, $name); my @onchange = $params{onchange} ? (onChange => delete $params{onchange}) : (); - my @class = $params{no_cal} || $params{readonly} ? () : (class => 'datepicker'); + 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, - id => $id, size => 11, onblur => "check_right_date_format(this);", %params, - @class, @onchange, + %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 { - 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 : ''; @@ -295,8 +291,7 @@ sub javascript_tag { } sub tabbed { - my ($self, $tabs, @slurp) = @_; - my %params = _hashify(@slurp); + my ($self, $tabs, %params) = _hashify(2, @_); my $id = $params{id} || 'tab_' . _tag_id(); $params{selected} *= 1; @@ -322,8 +317,7 @@ sub tabbed { } sub tab { - my ($self, $name, $src, @slurp) = @_; - my %params = _hashify(@slurp); + my ($self, $name, $src, %params) = _hashify(3, @_); $params{method} ||= 'process'; @@ -344,27 +338,20 @@ sub tab { } sub areainput_tag { - my ($self, $name, $value, @slurp) = @_; - my %attributes = _hashify(@slurp); + 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 { - my ($self, $id, @slurp) = @_; - my %params = _hashify(@slurp); + my ($self, $id, %params) = _hashify(2, @_); $params{labelsx} = "\"" . _J($params{labelsx} || $::locale->text('Available')) . "\""; $params{labeldx} = "\"" . _J($params{labeldx} || $::locale->text('Selected')) . "\""; @@ -383,8 +370,7 @@ EOCODE } sub sortable_element { - my ($self, $selector, @slurp) = @_; - my %params = _hashify(@slurp); + my ($self, $selector, %params) = _hashify(2, @_); my %attributes = ( distance => 5, helper => <<'JAVASCRIPT' ); @@ -403,8 +389,10 @@ JAVASCRIPT my $filter = ".filter(function(idx) { return this.substr(0, " . length($params{with}) . ") == '$params{with}'; })"; $filter .= ".map(function(idx, str) { return str.replace('$params{with}_', ''); })"; + my $params_js = $params{params} ? qq| + ($params{params})| : ''; + $stop_event = <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; - require Data::Dumper; return '
' . Data::Dumper::Dumper(@_) . '
'; } sub sortable_table_header { - my ($self, $by, @slurp) = @_; - my %params = _hashify(@slurp); + 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 %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}); - 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 = ''; - $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 '' . _H($title) . $image . ''; + return '' . _H($title) . $image . ''; } sub paginate_controls { - my ($self) = @_; + 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(@_); - $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}; + my %url_params = _hashify(0, @_); + $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, ); return SL::Presenter->get->render('common/paginate', %template_params); @@ -531,6 +510,10 @@ Usage from a template: A module modeled a bit after Rails' ActionView helpers. Several small functions that create HTML tags from various kinds of data sources. +The C attribute is usually calculated automatically. This can be +overridden by either specifying an C attribute or by setting +C to trueish. + =head1 FUNCTIONS =head2 LOW-LEVEL FUNCTIONS @@ -592,8 +575,8 @@ clicks the dialog's ok/yes button. 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 in C). The -button's label will be C<$text>. +called for that is C in +C). The button's label will be C<$text>. =item C @@ -745,6 +728,11 @@ If trueish then the children will not be recolored. The default is to recolor the children by setting the class C on odd and C on even entries. +=item C + +An optional JavaScript string that is evaluated before sending the +POST request. The result must be a string that is appended to the URL. + =back Example: