X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FTemplate%2FPlugin%2FL.pm;h=48960097ab0f15cfcd2b31f637c9c794b08e35f8;hb=23bbb82973bcaac52efd7eb1609801c11a8970f3;hp=78efe642aaaaae16214745cfd504c54a392e9f79;hpb=9aaadfdc06efbfb31f70c32cdf6aacf2f8a136f2;p=kivitendo-erp.git diff --git a/SL/Template/Plugin/L.pm b/SL/Template/Plugin/L.pm index 78efe642a..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 { @@ -99,6 +102,7 @@ sub checkbox_tag { $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'; @@ -106,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; @@ -116,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 { @@ -226,6 +235,8 @@ sub date_tag { 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, @@ -235,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("$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 : ''; @@ -262,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 : ''; @@ -339,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 { @@ -432,17 +428,6 @@ JAVASCRIPT 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 '
' . Data::Dumper::Dumper(@_) . '
'; @@ -452,39 +437,43 @@ sub sortable_table_header { 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, %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, @_); - $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, );