projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Sammelskript für alle Auth-Upgrades für 3.5.1
[kivitendo-erp.git]
/
SL
/
Presenter.pm
diff --git
a/SL/Presenter.pm
b/SL/Presenter.pm
index
abfd561
..
cd4f4e1
100644
(file)
--- a/
SL/Presenter.pm
+++ b/
SL/Presenter.pm
@@
-7,14
+7,29
@@
use parent qw(Rose::Object);
use Carp;
use Template;
use Carp;
use Template;
+use SL::Presenter::Chart;
use SL::Presenter::CustomerVendor;
use SL::Presenter::DeliveryOrder;
use SL::Presenter::EscapedText;
use SL::Presenter::Invoice;
use SL::Presenter::CustomerVendor;
use SL::Presenter::DeliveryOrder;
use SL::Presenter::EscapedText;
use SL::Presenter::Invoice;
+use SL::Presenter::GL;
+use SL::Presenter::Letter;
use SL::Presenter::Order;
use SL::Presenter::Order;
+use SL::Presenter::Part;
use SL::Presenter::Project;
use SL::Presenter::Record;
use SL::Presenter::Project;
use SL::Presenter::Record;
+use SL::Presenter::RequirementSpec;
+use SL::Presenter::RequirementSpecItem;
+use SL::Presenter::RequirementSpecTextBlock;
+use SL::Presenter::SepaExport;
+use SL::Presenter::ShopOrder;
use SL::Presenter::Text;
use SL::Presenter::Text;
+use SL::Presenter::Tag;
+use SL::Presenter::BankAccount;
+
+use Rose::Object::MakeMethods::Generic (
+ scalar => [ qw(need_reinit_widgets) ],
+);
sub get {
return $::request->presenter;
sub get {
return $::request->presenter;
@@
-39,7
+54,7
@@
sub render {
}
# Only certain types are supported.
}
# Only certain types are supported.
- croak "Unsupported type: " . $options->{type} unless $options->{type} =~ m/^(?:html|js|json)$/;
+ croak "Unsupported type: " . $options->{type} unless $options->{type} =~ m/^(?:html|js|json
|text
)$/;
# The "template" argument must be a string or a reference to one.
$template = ${ $template } if ((ref($template) || '') eq 'REF') && (ref(${ $template }) eq 'SL::Presenter::EscapedText');
# The "template" argument must be a string or a reference to one.
$template = ${ $template } if ((ref($template) || '') eq 'REF') && (ref(${ $template }) eq 'SL::Presenter::EscapedText');
@@
-48,7
+63,8
@@
sub render {
# Look for the file given by $template if $template is not a reference.
my $source;
if (!ref $template) {
# Look for the file given by $template if $template is not a reference.
my $source;
if (!ref $template) {
- $source = "templates/webpages/${template}." . $options->{type};
+ my $ext = $options->{type} eq 'text' ? 'txt' : $options->{type};
+ $source = "templates/webpages/${template}.${ext}";
croak "Template file ${source} not found" unless -f $source;
} elsif (ref($template) eq 'SCALAR') {
croak "Template file ${source} not found" unless -f $source;
} elsif (ref($template) eq 'SCALAR') {
@@
-98,6
+114,8
@@
sub render {
sub get_template {
my ($self) = @_;
sub get_template {
my ($self) = @_;
+ # Make locales.pl parse generic/exception.html, too:
+ # $::form->parse_html_template("generic/exception")
$self->{template} ||=
Template->new({ INTERPOLATE => 0,
EVAL_PERL => 0,
$self->{template} ||=
Template->new({ INTERPOLATE => 0,
EVAL_PERL => 0,
@@
-108,6
+126,7
@@
sub get_template {
COMPILE_EXT => '.tcc',
COMPILE_DIR => $::lx_office_conf{paths}->{userspath} . '/templates-cache',
ERROR => 'templates/webpages/generic/exception.html',
COMPILE_EXT => '.tcc',
COMPILE_DIR => $::lx_office_conf{paths}->{userspath} . '/templates-cache',
ERROR => 'templates/webpages/generic/exception.html',
+ ENCODING => 'utf8',
}) || croak;
return $self->{template};
}) || croak;
return $self->{template};
@@
-222,9
+241,10
@@
The following options are available:
=item C<type>
=item C<type>
-The template type. Can be C<html> (the default), C<js> for JavaScript
-or C<json> for JSON content. Affects only the extension that's added
-to the file name given with a non-reference C<$template> argument.
+The template type. Can be C<html> (the default), C<js> for JavaScript,
+C<json> for JSON and C<text> for plain text content. Affects only the
+extension that's added to the file name given with a non-reference
+C<$template> argument.
=item C<process>
=item C<process>
@@
-241,13
+261,17
@@
the following variables:
=item * C<AUTH> -- C<$::auth>
=item * C<AUTH> -- C<$::auth>
+=item * C<FLASH> -- the flash instance (C<$::form-E<gt>{FLASH}>)
+
=item * C<FORM> -- C<$::form>
=item * C<FORM> -- C<$::form>
+=item * C<INSTANCE_CONF> -- C<$::instance_conf>
+
=item * C<LOCALE> -- C<$::locale>
=item * C<LXCONFIG> -- all parameters from C<config/kivitendo.conf>
with the same name they appear in the file (first level is the
=item * C<LOCALE> -- C<$::locale>
=item * C<LXCONFIG> -- all parameters from C<config/kivitendo.conf>
with the same name they appear in the file (first level is the
-section, second the actual variable, e.g. C<system.
dbcharset
>,
+section, second the actual variable, e.g. C<system.
language
>,
C<features.webdav> etc)
=item * C<LXDEBUG> -- C<$::lxdebug>
C<features.webdav> etc)
=item * C<LXDEBUG> -- C<$::lxdebug>
@@
-256,6
+280,9
@@
C<features.webdav> etc)
=item * C<SELF> -- the controller instance
=item * C<SELF> -- the controller instance
+=item * C<PRESENTER> -- the presenter instance the template is
+rendered with
+
=item * All items from C<%locals>
=back
=item * All items from C<%locals>
=back