a few more discussion tweaks
This commit is contained in:
parent
0281564473
commit
dfd8b046b6
9 changed files with 45 additions and 23 deletions
|
|
@ -212,7 +212,7 @@ sub www_view {
|
|||
$count++;
|
||||
}
|
||||
$sth->finish;
|
||||
$var{areMultipleForums} = ($count > 1);
|
||||
$var{areMultipleForums} = ($count > 2);
|
||||
$var{forum_loop} = \@forum_loop;
|
||||
return $_[0]->processTemplate($_[0]->get("templateId"),\%var);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -516,6 +516,9 @@ sub www_viewSubmission {
|
|||
my $submission = $_[0]->getCollateral("USS_submission","USS_submissionId",$session{form}{sid});
|
||||
return $_[0]->www_view unless ($submission->{USS_submissionId});
|
||||
my $callback = WebGUI::URL::page("func=viewSubmission&wid=".$_[0]->get("wobjectId")."&sid=".$submission->{USS_submissionId});
|
||||
if ($session{form}{forumOp}) {
|
||||
return WebGUI::Forum::UI::forumOp($callback);
|
||||
}
|
||||
WebGUI::SQL->write("update USS_submission set views=views+1 where USS_submissionId=$session{form}{sid}");
|
||||
$var{title} = $submission->{title};
|
||||
$var{content} = WebGUI::HTML::filter($submission->{content},$_[0]->get("filterContent"));
|
||||
|
|
@ -579,11 +582,7 @@ sub www_viewSubmission {
|
|||
$var{"attachment.name"} = $file->getFilename;
|
||||
}
|
||||
if ($_[0]->get("allowDiscussion")) {
|
||||
if ($session{form}{forumOp}) {
|
||||
$var{"replies"} = WebGUI::Forum::UI::forumOp($callback);
|
||||
} else {
|
||||
$var{"replies"} = WebGUI::Forum::UI::www_viewForum($callback,$submission->{forumId});
|
||||
}
|
||||
$var{"replies"} = WebGUI::Forum::UI::www_viewForum($callback,$submission->{forumId});
|
||||
}
|
||||
return WebGUI::Template::process(WebGUI::Template::get($_[0]->get("submissionTemplateId"),"USS/Submission"), \%var);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue