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

Fix bad URLs from happening when inheritUrlFromParent is used. Fixes bug #11011

Browse source
This commit is contained in:
Colin Kuskie 2009-09-22 11:45:06 -07:00
parent 4fc3e55a3a
commit 9d438f7266
3 changed files with 13 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lib/WebGUI/Asset.pm
View file

@ -681,12 +681,12 @@ sub fixUrl {
$url =~ s/(.*)\..*/$1/;
$url .= '/'.$self->getValue("menuTitle");
}
$url = $self->session->url->urlize($url);
# if we're inheriting the URL from our parent, set that appropriately
if($self->get('inheritUrlFromParent')) {
$url = $self->fixUrlFromParent($url);
}
$url = $self->session->url->urlize($url);
# fix urls used by uploads and extras
# and those beginning with http
@ -768,15 +768,10 @@ sub fixUrlFromParent {
my @parts = split(m{/}, $url);
# don't do anything unless we need to
if("/$url" ne $self->getParent->getUrl . '/' . $parts[-1]) {
$url = $self->getParent->getUrl . '/' . $parts[-1];
if($url ne $self->getParent->get('url') . '/' . $parts[-1]) {
$url = $self->getParent->get('url') . '/' . $parts[-1];
}
##Note we do not need to call fixUrl on the url argument. Here's the reasoning why.
##If a URL has not been set to updated at the same time that inheritUrlFromParent is
##called, then it has already been "fixed".
##On the other hand, if it has, the sideEffect nature of this method guarantees that
##the URL was "fixed" before it was called.
return $url;
}