Skip to content
Snippets Groups Projects
Commit 3d25c943 authored by Clément OUDOT's avatar Clément OUDOT Committed by Clément OUDOT
Browse files

Merge branch '2996-invalid-url-for-application-logo-in-myapplications-web-service' into 'v2.0'

Resolve "Invalid URL for application logo in myapplications web service"

See merge request !377

(cherry picked from commit 26a440e5)
parent 56759394
No related branches found
No related tags found
No related merge requests found
......@@ -786,9 +786,8 @@ sub getUser {
sub myApplications {
my ( $self, $req ) = @_;
my $basePath = $self->conf->{portal};
$basePath =~ s#/*$#/#;
$basePath =~ s#/*$##;
$basePath .= $self->p->{staticPrefix} . '/common/apps/';
$basePath =~ s#//+#/#;
my @appslist = map {
my @apps = map {
{
......
......@@ -83,7 +83,7 @@ ok(
);
ok(
$res->{myapplications}->[0]->{Applications}->[0]->{'Application Test 1'}
->{AppLogo} eq 'http:/auth.example.com//static/common/apps/demo.png',
->{AppLogo} eq 'http://auth.example.com/static/common/apps/demo.png',
' Logo app1 found'
);
ok(
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment