X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FBase.pm;h=a37ac8bef315faf181599e6e603789251b7fd2ae;hb=54d156a23732e809e330b86c5231f1e525ac087f;hp=876aac30fdfb5f92f6c847dc95371a036987d5ec;hpb=7af2b12887c4b1cb0cb427960c57f5b777b85315;p=kivitendo-erp.git diff --git a/SL/Controller/Base.pm b/SL/Controller/Base.pm index 876aac30f..a37ac8bef 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); } @@ -80,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'); @@ -110,10 +112,11 @@ 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, - charset => $::lx_office_conf{system}->{dbcharset} || Common::DEFAULT_CHARSET()); + charset => 'UTF-8'); } } @@ -399,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 @@ -500,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 @@ -552,13 +562,16 @@ C (authentication as a normal user suffices) with a possible future value C (which would require no authentication but is not yet implemented). -=item C +=item C May be overridden by a controller. If falsish (the default) all form variables whose name starts with C<{AUTH}> are removed before the request is routed. Only controllers that handle login requests themselves should return trueish for this function. +C<$params{action}> contains the action name that the request will be +dispatched to. + =item C Returns the name of the curernt controller package without the