X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=SL%2FPresenter%2FChart.pm;h=3a4f483904f9a223e0aa9b336c7e21a655667ac2;hb=fd5cfc0ff050c49531477bc55bab631a3860bb17;hp=58c6b858c3a2a4e859dbb298b6bc4bb62a2ab49b;hpb=5aec18fed79986d088e3a7ed05a9166c48d05b39;p=kivitendo-erp.git
diff --git a/SL/Presenter/Chart.pm b/SL/Presenter/Chart.pm
index 58c6b858c..3a4f48390 100644
--- a/SL/Presenter/Chart.pm
+++ b/SL/Presenter/Chart.pm
@@ -5,31 +5,33 @@ use strict;
use SL::DB::Chart;
use Exporter qw(import);
-use Data::Dumper;
-our @EXPORT = qw(chart_picker chart);
+our @EXPORT_OK = qw(chart_picker chart);
use Carp;
+use Data::Dumper;
+use SL::Presenter::EscapedText qw(escape is_escaped);
+use SL::Presenter::Tag qw(input_tag name_to_id html_tag);
sub chart {
- my ($self, $chart, %params) = @_;
+ my ($chart, %params) = @_;
$params{display} ||= 'inline';
croak "Unknown display type '$params{display}'" unless $params{display} =~ m/^(?:inline|table-cell)$/;
my $text = join '', (
- $params{no_link} ? '' : '',
- $self->escape($chart->accno),
+ $params{no_link} ? '' : '',
+ escape($chart->accno),
$params{no_link} ? '' : '',
);
- return $self->escaped_text($text);
+ is_escaped($text);
}
sub chart_picker {
- my ($self, $name, $value, %params) = @_;
+ my ($name, $value, %params) = @_;
$value = SL::DB::Manager::Chart->find_by(id => $value) if $value && !ref $value;
- my $id = delete($params{id}) || $self->name_to_id($name);
+ my $id = delete($params{id}) || name_to_id($name);
my $fat_set_item = delete $params{fat_set_item};
my @classes = $params{class} ? ($params{class}) : ();
@@ -37,16 +39,18 @@ sub chart_picker {
push @classes, 'chartpicker_fat_set_item' if $fat_set_item;
my $ret =
- $self->input_tag($name, (ref $value && $value->can('id') ? $value->id : ''), class => "@classes", type => 'hidden', id => $id) .
- join('', map { $params{$_} ? $self->input_tag("", delete $params{$_}, id => "${id}_${_}", type => 'hidden') : '' } qw(type category choose booked)) .
- $self->input_tag("", (ref $value && $value->can('displayable_name')) ? $value->displayable_name : '', id => "${id}_name", %params);
+ input_tag($name, (ref $value && $value->can('id') ? $value->id : ''), class => "@classes", type => 'hidden', id => $id) .
+ join('', map { $params{$_} ? input_tag("", delete $params{$_}, id => "${id}_${_}", type => 'hidden') : '' } qw(type category choose booked)) .
+ input_tag("", (ref $value && $value->can('displayable_name')) ? $value->displayable_name : '', id => "${id}_name", %params);
$::request->layout->add_javascripts('autocomplete_chart.js');
$::request->presenter->need_reinit_widgets($id);
- $self->html_tag('span', $ret, class => 'chart_picker');
+ html_tag('span', $ret, class => 'chart_picker');
}
+sub picker { goto &chart_picker }
+
1;
__END__
@@ -61,7 +65,7 @@ SL::Presenter::Chart - Chart related presenter stuff
# Create an html link for editing/opening a chart
my $object = SL::DB::Manager::Chart->get_first;
- my $html = SL::Presenter->get->chart($object, display => 'inline');
+ my $html = SL::Presenter::Chart::chart($object, display => 'inline');
see also L