Database efficiency improvements.
This commit is contained in:
parent
547e10affd
commit
f0ebc98582
12 changed files with 100 additions and 52 deletions
|
|
@ -158,13 +158,17 @@ sub www_view {
|
|||
$var{"attachment.url"} = $file->getURL;
|
||||
$var{"attachment.name"} = $file->getFilename;
|
||||
}
|
||||
($var{"replies.count"}) = WebGUI::SQL->quickArray("select count(*) from discussion where wobjectId=".$_[0]->get("wobjectId"));
|
||||
$var{"replies.URL"} = WebGUI::URL::page('func=showMessage&wid='.$_[0]->get("wobjectId"));
|
||||
$var{"replies.label"} = WebGUI::International::get(28,$namespace);
|
||||
$var{"post.URL"} = WebGUI::URL::page('func=post&mid=new&wid='.$_[0]->get("wobjectId"));
|
||||
$var{"post.label"} = WebGUI::International::get(24,$namespace);
|
||||
if ($_[0]->get("allowDiscussion")) {
|
||||
($var{"replies.count"}) = WebGUI::SQL->quickArray("select count(*) from discussion
|
||||
where wobjectId=".$_[0]->get("wobjectId"));
|
||||
$var{"replies.URL"} = WebGUI::URL::page('func=showMessage&wid='.$_[0]->get("wobjectId"));
|
||||
$var{"replies.label"} = WebGUI::International::get(28,$namespace);
|
||||
$var{"post.URL"} = WebGUI::URL::page('func=post&mid=new&wid='.$_[0]->get("wobjectId"));
|
||||
$var{"post.label"} = WebGUI::International::get(24,$namespace);
|
||||
}
|
||||
return $_[0]->processMacros($_[0]->processTemplate($_[0]->get("templateId"),\%var));
|
||||
}
|
||||
|
||||
|
||||
1;
|
||||
|
||||
|
|
|
|||
|
|
@ -29,11 +29,6 @@ our @ISA = qw(WebGUI::Wobject);
|
|||
our $namespace = "MessageBoard";
|
||||
our $name = WebGUI::International::get(2,$namespace);
|
||||
|
||||
our %status =("Approved"=>WebGUI::International::get(560),
|
||||
"Denied"=>WebGUI::International::get(561),
|
||||
"Pending"=>WebGUI::International::get(562));
|
||||
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
sub duplicate {
|
||||
my ($w);
|
||||
|
|
@ -50,6 +45,17 @@ sub set {
|
|||
$_[0]->SUPER::set($_[1],[qw(templateId messagesPerPage)]);
|
||||
}
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
sub status {
|
||||
if ($_[0] eq "Approved") {
|
||||
return WebGUI::International::get(560);
|
||||
} elsif ($_[0] eq "Denied") {
|
||||
return WebGUI::International::get(561);
|
||||
} elsif ($_[0] eq "Pending") {
|
||||
return WebGUI::International::get(562);
|
||||
}
|
||||
}
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
sub www_edit {
|
||||
return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
|
||||
|
|
@ -124,7 +130,7 @@ sub www_view {
|
|||
"message.url" => WebGUI::URL::page('func=showMessage&mid='.$data->{messageId}.'&wid='.$_[0]->get("wobjectId")),
|
||||
"message.subject" => substr($data->{subject},0,30),
|
||||
"message.currentUser" => ($data->{userId} == $session{user}{userId}),
|
||||
"message.status" => $status{$data->{status}},
|
||||
"message.status" => status($data->{status}),
|
||||
"message.userProfile" => WebGUI::URL::page('op=viewProfile&uid='.$data->{userId}),
|
||||
"message.username" => $data->{username},
|
||||
"message.date" => epochToHuman($data->{dateOfPost}),
|
||||
|
|
|
|||
|
|
@ -34,10 +34,6 @@ our @ISA = qw(WebGUI::Wobject);
|
|||
our $namespace = "USS";
|
||||
our $name = WebGUI::International::get(29,$namespace);
|
||||
|
||||
our %submissionStatus =("Approved"=>WebGUI::International::get(560),
|
||||
"Denied"=>WebGUI::International::get(561),
|
||||
"Pending"=>WebGUI::International::get(562));
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
sub duplicate {
|
||||
my ($sth, $file, %row, $newSubmissionId, $w);
|
||||
|
|
@ -82,6 +78,17 @@ sub set {
|
|||
submissionTemplateId templateId karmaPerSubmission allowDiscussion)]);
|
||||
}
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
sub status {
|
||||
if ($_[0] eq "Approved") {
|
||||
return WebGUI::International::get(560);
|
||||
} elsif ($_[0] eq "Denied") {
|
||||
return WebGUI::International::get(561);
|
||||
} elsif ($_[0] eq "Pending") {
|
||||
return WebGUI::International::get(562);
|
||||
}
|
||||
}
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
sub www_approveSubmission {
|
||||
my (%submission);
|
||||
|
|
@ -181,7 +188,8 @@ sub www_edit {
|
|||
$f->group("groupToApprove",WebGUI::International::get(1,$namespace),[$groupToApprove]);
|
||||
$f->group("groupToContribute",WebGUI::International::get(2,$namespace),[$_[0]->get("groupToContribute")]);
|
||||
$f->integer("submissionsPerPage",WebGUI::International::get(6,$namespace),$submissionsPerPage);
|
||||
$f->select("defaultStatus",\%submissionStatus,WebGUI::International::get(563),[$defaultStatus]);
|
||||
$f->select("defaultStatus",{Approved=>status('Approved'),Denied=>status('Denied'),Pending=>status('Pending')}
|
||||
,WebGUI::International::get(563),[$defaultStatus]);
|
||||
if ($session{setting}{useKarma}) {
|
||||
$f->integer("karmaPerSubmission",WebGUI::International::get(30,$namespace),$_[0]->get("karmaPerSubmission"));
|
||||
} else {
|
||||
|
|
@ -395,7 +403,7 @@ sub www_viewSubmission {
|
|||
$var{"date.epoch"} = $submission->{dateSubmitted};
|
||||
$var{"date.human"} = epochToHuman($submission->{dateSubmitted});
|
||||
$var{"status.label"} = WebGUI::International::get(14,$namespace);
|
||||
$var{"status.status"} = $submissionStatus{$submission->{status}};
|
||||
$var{"status.status"} = status($submission->{status});
|
||||
$var{"views.label"} = WebGUI::International::get(514);
|
||||
$var{"views.count"} = $submission->{views};
|
||||
$var{canPost} = WebGUI::Privilege::isInGroup($_[0]->get("groupToContribute"));
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue