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

Moved the www_search and www_showMessage methods to the wobject superclass. Also the duplicate and purge methods in the superclass now automatically perform the discussion operations.

Browse source
This commit is contained in:
JT Smith 2002-09-29 23:59:22 +00:00
parent 37a34966eb
commit 1be05a3391
4 changed files with 37 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

31
lib/WebGUI/Wobject.pm
View file

@ -239,6 +239,7 @@ sub duplicate {
endDate => $_[0]->get("endDate"), endDate => $_[0]->get("endDate"),
templatePosition => $_[0]->get("templatePosition") templatePosition => $_[0]->get("templatePosition")
}); });
WebGUI::Discussion::duplicate($_[0]->get("wobjectId"),$w->get("wobjectId")) unless ($_[2]);
return $w->get("wobjectId"); return $w->get("wobjectId");
} }
@ -464,6 +465,7 @@ sub purge {
WebGUI::SQL->write("delete from wobject where wobjectId=".$_[0]->get("wobjectId")); WebGUI::SQL->write("delete from wobject where wobjectId=".$_[0]->get("wobjectId"));
$node = WebGUI::Node->new($_[0]->get("wobjectId")); $node = WebGUI::Node->new($_[0]->get("wobjectId"));
$node->delete; $node->delete;
WebGUI::Discussion::purge($_[0]->get("wobjectId"));
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
@ -1005,6 +1007,35 @@ sub www_postSave {
#------------------------------------------------------------------- #-------------------------------------------------------------------
=head2 www_search ( )
Searches an attached discussion.
=cut
sub www_search {
return WebGUI::Discussion::search();
}
#-------------------------------------------------------------------
=head2 www_showMessage ( )
Shows a message from a discussion.
=cut
sub www_showMessage {
my ($output, $defaultMid);
($defaultMid) = WebGUI::SQL->quickArray("select min(messageId) from discussion where wobjectId=".$_[0]->get("wobjectId"));
$session{form}{mid} = $session{form}{mid} || $defaultMid || 0;
$output = WebGUI::Discussion::showMessage($_[1],$_[0]);
$output .= WebGUI::Discussion::showThreads();
return $output;
}
#-------------------------------------------------------------------
=head2 www_unlockThread ( ) =head2 www_unlockThread ( )
Unlocks a discussion thread from the current message on down. Unlocks a discussion thread from the current message on down.

16
lib/WebGUI/Wobject/Article.pm
View file

@ -14,7 +14,6 @@ use strict;
use Tie::CPHash; use Tie::CPHash;
use WebGUI::Attachment; use WebGUI::Attachment;
use WebGUI::DateTime; use WebGUI::DateTime;
use WebGUI::Discussion;
use WebGUI::HTML; use WebGUI::HTML;
use WebGUI::HTMLForm; use WebGUI::HTMLForm;
use WebGUI::Icon; use WebGUI::Icon;
@ -48,13 +47,6 @@ sub duplicate {
alignImage=>$_[0]->get("alignImage"), alignImage=>$_[0]->get("alignImage"),
allowDiscussion=>$_[0]->get("allowDiscussion") allowDiscussion=>$_[0]->get("allowDiscussion")
}); });
WebGUI::Discussion::duplicate($_[0]->get("wobjectId"),$w->get("wobjectId"));
}
#-------------------------------------------------------------------
sub purge {
WebGUI::Discussion::purge($_[0]->get("wobjectId"));
$_[0]->SUPER::purge();
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
@ -152,13 +144,7 @@ sub www_editSave {
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_showMessage { sub www_showMessage {
my ($submenu, $output, $defaultMid); return $_[0]->SUPER::www_showMessage('<a href="'.WebGUI::URL::page().'">'.WebGUI::International::get(27,$namespace).'</a><br>');
($defaultMid) = WebGUI::SQL->quickArray("select min(messageId) from discussion where wobjectId=$session{form}{wid}");
$session{form}{mid} = $defaultMid if ($session{form}{mid} eq "");
$submenu = '<a href="'.WebGUI::URL::page().'">'.WebGUI::International::get(27,$namespace).'</a><br>';
$output = WebGUI::Discussion::showMessage($submenu,$_[0]);
$output .= WebGUI::Discussion::showThreads();
return $output;
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------

18
lib/WebGUI/Wobject/MessageBoard.pm
View file

@ -43,13 +43,6 @@ sub duplicate {
$w->set({ $w->set({
messagesPerPage=>$_[0]->get("messagesPerPage") messagesPerPage=>$_[0]->get("messagesPerPage")
}); });
WebGUI::Discussion::duplicate($_[0]->get("wobjectId"),$w->get("wobjectId"));
}
#-------------------------------------------------------------------
sub purge {
WebGUI::Discussion::purge($_[0]->get("wobjectId"));
$_[0]->SUPER::purge();
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
@ -88,18 +81,9 @@ sub www_editSave {
} }
} }
#-------------------------------------------------------------------
sub www_search {
return WebGUI::Discussion::search();
}
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_showMessage { sub www_showMessage {
my ($output, $submenu); return $_[0]->SUPER::www_showMessage('<a href="'.WebGUI::URL::page().'">'.WebGUI::International::get(11,$namespace).'</a><br>');
$submenu = '<a href="'.WebGUI::URL::page().'">'.WebGUI::International::get(11,$namespace).'</a><br>';
$output = WebGUI::Discussion::showMessage($submenu,$_[0]);
$output .= WebGUI::Discussion::showReplyTree();
return $output;
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------

13
lib/WebGUI/Wobject/UserSubmission.pm
View file

@ -190,7 +190,7 @@ sub _weblogView {
sub duplicate { sub duplicate {
my ($sth, $file, %row, $newSubmissionId, $w); my ($sth, $file, %row, $newSubmissionId, $w);
tie %row, 'Tie::CPHash'; tie %row, 'Tie::CPHash';
$w = $_[0]->SUPER::duplicate($_[1]); $w = $_[0]->SUPER::duplicate($_[1],1);
$w = WebGUI::Wobject::UserSubmission->new({wobjectId=>$w,namespace=>$namespace}); $w = WebGUI::Wobject::UserSubmission->new({wobjectId=>$w,namespace=>$namespace});
$w->set({ $w->set({
groupToContribute=>$_[0]->get("groupToContribute"), groupToContribute=>$_[0]->get("groupToContribute"),
@ -221,7 +221,6 @@ sub duplicate {
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub purge { sub purge {
WebGUI::SQL->write("delete from UserSubmission_submission where wobjectId=".$_[0]->get("wobjectId")); WebGUI::SQL->write("delete from UserSubmission_submission where wobjectId=".$_[0]->get("wobjectId"));
WebGUI::Discussion::purge($_[0]->get("wobjectId"));
$_[0]->SUPER::purge(); $_[0]->SUPER::purge();
} }
@ -520,13 +519,9 @@ sub www_search {
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_showMessage { sub www_showMessage {
my ($submenu, $output); return $_[0]->SUPER::www_showMessage('<a href="'.WebGUI::URL::page('func=viewSubmission&wid='.$session{form}{wid}
$submenu .= '<a href="'.WebGUI::URL::page('func=viewSubmission&wid='.$session{form}{wid}. .'&sid='.$session{form}{sid}).'">'.WebGUI::International::get(45,$namespace).'</a><br>'
'&sid='.$session{form}{sid}).'">'.WebGUI::International::get(45,$namespace).'</a><br>'; .'<a href="'.WebGUI::URL::page().'">'.WebGUI::International::get(28,$namespace).'</a><br>');
$submenu .= '<a href="'.WebGUI::URL::page().'">'.WebGUI::International::get(28,$namespace).'</a><br>';
$output = WebGUI::Discussion::showMessage($submenu,$_[0]);
$output .= WebGUI::Discussion::showThreads();
return $output;
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------