X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FBase.pm;h=c6977d0e10b6941f7e416eeed4c192479a50a5eb;hb=d70e6870a8cbadc86b0584a780e6f84c95dcb21d;hp=01e2db4f0b5929d10d6708e3a034cd3acdf0e366;hpb=f3978ea1c30d283b9d46be0766a33c568ade511c;p=kivitendo-erp.git diff --git a/SL/Controller/Base.pm b/SL/Controller/Base.pm index 01e2db4f0..c6977d0e1 100644 --- a/SL/Controller/Base.pm +++ b/SL/Controller/Base.pm @@ -52,6 +52,8 @@ sub redirect_to { SL::Helper::Flash::delay_flash(); } + return $self->render(SL::ClientJS->new->redirect_to($self->url_for(@_))) if $::request->is_ajax; + print $::request->{cgi}->redirect($url); } @@ -60,6 +62,9 @@ sub render { my $template = shift; my ($options, %locals) = (@_ && ref($_[0])) ? @_ : ({ }, @_); + # Special handling/shortcut for an instance of SL::ClientJS: + return $self->render(\$template->to_json, { type => 'json' }) if ref($template) eq 'SL::ClientJS'; + # Set defaults for all available options. my %defaults = ( type => 'html', @@ -77,7 +82,7 @@ sub render { } # 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'); @@ -107,6 +112,7 @@ sub render { $::form->{header} = 1; my $content_type = $options->{type} eq 'html' ? 'text/html' : $options->{type} eq 'js' ? 'text/javascript' + : $options->{type} eq 'text' ? 'text/plain' : 'application/json'; print $::form->create_http_response(content_type => $content_type, @@ -381,6 +387,11 @@ If C<$template> is a reference to a scalar then the referenced scalar's content is used as the content to process. The C option is not considered in this case. +C<$template> can also be an instance of L +or a reference to such an instance. Both of these cases are handled +the same way as if C<$template> were a reference to a scalar: its +content is processed, and C is not considered. + Other reference types, unknown options and unknown arguments to the C option cause the function to L. @@ -391,11 +402,12 @@ C = 1, C = 1, C
= 1, C = 1): =item C -The template type. Can be C (the default), C for JavaScript -or C for JSON content. Affects the extension that's added to the -file name given with a non-reference C<$template> argument, the -content type HTTP header that is output and whether or not the layout -will be output as well (see description of C below). +The template type. Can be C (the default), C for JavaScript, +C for JSON and C for plain text content. Affects the +extension that's added to the file name given with a non-reference +C<$template> argument, the content type HTTP header that is output and +whether or not the layout will be output as well (see description of +C below). =item C @@ -492,9 +504,15 @@ Usage from a template might look like this: =item C -Redirects the browser to a new URL by outputting a HTTP redirect -header. The URL is generated by calling L with -C<%url_params>. +Redirects the browser to a new URL. The URL is generated by calling +L with C<%url_params>. + +This function implements the redirection depending on whether or not +the current request is an AJAX request as determined by +L. If it is a normal request then it outputs a +standard HTTP redirect header (HTTP code 302). If it is an AJAX +request then it outputs an AJAX response suitable for the +C function from the L module. =item C