projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ungenutzte Funktion retrieve_assemblies in IC.pm entfernt
[kivitendo-erp.git]
/
SL
/
Controller
/
Layout.pm
diff --git
a/SL/Controller/Layout.pm
b/SL/Controller/Layout.pm
index
98c012c
..
e92e861
100644
(file)
--- a/
SL/Controller/Layout.pm
+++ b/
SL/Controller/Layout.pm
@@
-3,12
+3,12
@@
package SL::Controller::Layout;
use strict;
use parent qw(SL::Controller::Base);
use strict;
use parent qw(SL::Controller::Base);
-use JSON ();
+use
SL::
JSON ();
sub action_empty {
my ($self) = @_;
sub action_empty {
my ($self) = @_;
- if ($::form->{format} eq 'json') {
+ if ($::form->{format} eq 'json'
|| $::request->type eq 'json'
) {
my $layout = {
pre_content => $::request->{layout}->pre_content,
start_content => $::request->{layout}->start_content,
my $layout = {
pre_content => $::request->{layout}->pre_content,
start_content => $::request->{layout}->start_content,
@@
-20,7
+20,9
@@
sub action_empty {
stylesheets_inline => [ $::request->{layout}->stylesheets_inline ],
};
stylesheets_inline => [ $::request->{layout}->stylesheets_inline ],
};
- $self->render(\ JSON::to_json($layout), { type => 'js', raw => 1 });
+ $self->render(\ SL::JSON::to_json($layout), { type => 'json', process => 0 });
+ } else {
+ $self->render(\'', { process => 0 });
}
}
}
}