oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix gateway url handling in the RenderThingData macro. Fixes one part of #12133.

Browse source
This commit is contained in:
Colin Kuskie 2011-05-31 21:27:53 -07:00
parent b866601efa
commit 197f94c0e5
3 changed files with 25 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

19
lib/WebGUI/Macro/RenderThingData.pm
View file

@ -41,21 +41,24 @@ sub process {
my ($session, $thingDataUrl, $templateHint ) = @_;
my $i18n = WebGUI::International->new($session, 'Macro_RenderThingData');
return $i18n->get('no template') if !$templateHint;
my $uri = URI->new( $thingDataUrl );
my $gateway = $session->config->get('gateway');
my $uri = URI->new( $thingDataUrl );
my $thingy_url = $uri->path;
$thingy_url =~ s/^$gateway//;
my $urlHash = { $uri->query_form };
my $thingId = $urlHash->{'thingId'};
my $thingDataId = $urlHash->{'thingDataId'};
my $thing = WebGUI::Asset::Wobject::Thingy->newByUrl( $session, $uri->path );
my $thing = WebGUI::Asset::Wobject::Thingy->newByUrl( $session, $thingy_url );
# TODO: i18n
return ( $i18n->get('bad url') . $thingDataUrl ) if !$thing || !$thingId || !$thingDataId;
# Render
my $output = $thing->www_viewThingData( $thingId, $thingDataId, $templateHint );
# FIX: Temporary solution (broken map due to template rendering <script> tags)
return $i18n->get('bad tags') if $output =~ /script>/;