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

Fix how Thread determines the "current" Post to be a little more logical,

Browse source 
and fix shortcuts to non-Thread Posts (they weren't doing prepareView on
the thread).
This commit is contained in:
Drake 2006-11-22 15:38:32 +00:00
parent 3ca4bf725a
commit 0903b1011e
3 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -13,6 +13,7 @@
- fix: HttpProxy now handles styles appropriately. - fix: HttpProxy now handles styles appropriately.
- fix: op=viewPurchaseHistory prices are now formatted correctly - fix: op=viewPurchaseHistory prices are now formatted correctly
- fix: A minor bug in the default viewPurchaseHistory template - fix: A minor bug in the default viewPurchaseHistory template
- fix: Thread determination of "current" Post, and shortcuts to non-Thread Posts
7.2.1 7.2.1
- Made a change to version tag commits to deal with unusually long commit - Made a change to version tag commits to deal with unusually long commit

11
lib/WebGUI/Asset/Post.pm
View file

@ -979,10 +979,19 @@ sub update {
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub prepareView {
my $self = shift;
$self->SUPER::prepareView;
unless ($self->getThread->getId eq $self->getId) {
# Need the unless to avoid infinite recursion.
$self->getThread->prepareView;
}
}
sub view { sub view {
my $self = shift; my $self = shift;
$self->incrementViews; $self->incrementViews;
return $self->getThread->view; return $self->getThread->view($self);
} }

3
lib/WebGUI/Asset/Post/Thread.pm
View file

@ -770,6 +770,7 @@ sub unsubscribe {
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub view { sub view {
my $self = shift; my $self = shift;
my $currentPost = shift || $self;
$self->markRead; $self->markRead;
$self->incrementViews unless ($self->session->form->process("func") eq 'rate'); $self->incrementViews unless ($self->session->form->process("func") eq 'rate');
if ($self->session->user->userId eq '1' && !$self->session->form->process("layout")) { if ($self->session->user->userId eq '1' && !$self->session->form->process("layout")) {
@ -852,7 +853,7 @@ sub view {
my $reply = WebGUI::Asset::Post->new($self->session, $dataSet->{assetId}, $dataSet->{className}, $dataSet->{revisionDate}); my $reply = WebGUI::Asset::Post->new($self->session, $dataSet->{assetId}, $dataSet->{className}, $dataSet->{revisionDate});
$reply->{_thread} = $self; # caching thread for better performance $reply->{_thread} = $self; # caching thread for better performance
my %replyVars = %{$reply->getTemplateVars}; my %replyVars = %{$reply->getTemplateVars};
$replyVars{isCurrent} = ($reply->get("url") eq $currentPageUrl); $replyVars{isCurrent} = ($reply->getId eq $currentPost->getId);
$replyVars{isThreadRoot} = $self->getId eq $reply->getId; $replyVars{isThreadRoot} = $self->getId eq $reply->getId;
$replyVars{depth} = $reply->getLineageLength - $self->getLineageLength; $replyVars{depth} = $reply->getLineageLength - $self->getLineageLength;
$replyVars{depthX10} = $replyVars{depth}*10; $replyVars{depthX10} = $replyVars{depth}*10;