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

fixed: Collaboration System errors when missing RSS From Parent

Browse source
This commit is contained in:
Graham Knop 2008-03-25 20:07:16 +00:00
parent 466baa1c81
commit ab0d5cbecb
2 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
docs/changelog/7.x.x.txt
View file

@ -19,6 +19,7 @@
- fixed: DataForm will create fields with duplicate names but doesn't use them separately - fixed: DataForm will create fields with duplicate names but doesn't use them separately
- fixed: Bad message if database link for SQL Report doesn't exist - fixed: Bad message if database link for SQL Report doesn't exist
- fixed: Thingy shows things from other Thingies - fixed: Thingy shows things from other Thingies
- fixed: Collaboration System errors when missing RSS From Parent
7.5.7 7.5.7
- fixed: HttpProxy mixes original site's content encoding with WebGUI's - fixed: HttpProxy mixes original site's content encoding with WebGUI's

10
lib/WebGUI/Asset/RSSCapable.pm
View file

@ -78,9 +78,10 @@ sub definition {
sub _rssFromParentValid { sub _rssFromParentValid {
my $self = shift; my $self = shift;
my $rssFromParentId = $self->get('rssCapableRssFromParentId'); my $rssFromParentId = $self->get('rssCapableRssFromParentId');
return 0 unless $rssFromParentId; return undef unless $rssFromParentId;
my $rssFromParent = WebGUI::Asset->newByDynamicClass($self->session, $rssFromParentId); my $rssFromParent = WebGUI::Asset->newByDynamicClass($self->session, $rssFromParentId);
return undef unless $rssFromParent;
return ($rssFromParent->isa('WebGUI::Asset::RSSFromParent') return ($rssFromParent->isa('WebGUI::Asset::RSSFromParent')
&& $rssFromParent->getParent->getId eq $self->getId); && $rssFromParent->getParent->getId eq $self->getId);
} }
@ -137,7 +138,6 @@ sub processPropertiesFromFormPost {
my $self = shift; my $self = shift;
my $error = $self->NEXT::processPropertiesFromFormPost(@_); my $error = $self->NEXT::processPropertiesFromFormPost(@_);
return $error if ref $error eq 'ARRAY'; return $error if ref $error eq 'ARRAY';
if ($self->get('rssCapableRssEnabled')) { if ($self->get('rssCapableRssEnabled')) {
$self->_ensureRssFromParentPresent; $self->_ensureRssFromParentPresent;
} else { } else {
@ -159,8 +159,10 @@ if there is no such feed.
sub getRssUrl { sub getRssUrl {
my $self = shift; my $self = shift;
my $rssFromParentId = $self->get('rssCapableRssFromParentId'); my $rssFromParentId = $self->get('rssCapableRssFromParentId');
return undef unless defined $rssFromParentId; return undef unless $rssFromParentId;
WebGUI::Asset->newByDynamicClass($self->session, $rssFromParentId)->getUrl; my $rssAsset = WebGUI::Asset->newByDynamicClass($self->session, $rssFromParentId);
return undef unless $rssAsset;
return $rssAsset->getUrl;
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------