dani/lemonldap-ng
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prettify json on manager conf export (#2292)

Browse Source
This commit is contained in:
Maxime Besson 2020-08-25 16:09:06 +02:00
parent bcb6c428f1
commit d5b47115ee
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/RESTServer.pm
View File

@ -769,8 +769,8 @@ sub metadata {
return $self->sendJSONresponse( return $self->sendJSONresponse(
$req, $req,
$self->currentConf, $self->currentConf,
forceJSON => 1, pretty => 1,
headers => [ headers => [
'Content-Disposition' => "Attachment; filename=lmConf-$c.json" 'Content-Disposition' => "Attachment; filename=lmConf-$c.json"
], ],
); );

18
lemonldap-ng-common/lib/Lemonldap/NG/Common/PSGI.pm
View File

@ -125,7 +125,23 @@ sub sendJSONresponse {
$args{headers} ||= [ $req->spliceHdrs ]; $args{headers} ||= [ $req->spliceHdrs ];
my $type = 'application/json; charset=utf-8'; my $type = 'application/json; charset=utf-8';
if ( ref $j ) { if ( ref $j ) {
eval { $j = $_json->encode($j); }; eval {
if ( $args{pretty} ) {
# This avoids changing the settings of the $_json reference
$j = to_json(
$j,
{
allow_nonref => 1,
pretty => 1,
canonical => 1
}
);
}
else {
$j = $_json->encode($j);
}
};
return $self->sendError( $req, $@ ) if ($@); return $self->sendError( $req, $@ ) if ($@);
} }
return [ $args{code}, [ 'Content-Type' => $type, @{ $args{headers} } ], return [ $args{code}, [ 'Content-Type' => $type, @{ $args{headers} } ],