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

some cs fixes

Browse source
This commit is contained in:
JT Smith 2006-03-26 20:43:50 +00:00
parent e689c33db6
commit 22b7ec886b
4 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
docs/upgrades/upgrade_6.8.7-6.99.0.pl
View file

@ -26,6 +26,7 @@ my $session = start(); # this line required
addWorkflow();
convertMessageLogToInbox();
addCsPopularityContest();
templateParsers();
removeFiles();
addSearchEngine();
@ -105,7 +106,7 @@ sub addCsPopularityContest {
$session->db->write("alter table Collaboration add column defaultKarmaScale integer not null default 1");
$session->db->write("alter table Thread add column karma integer not null default 0");
$session->db->write("alter table Thread add column karmaScale integer not null default 1");
$session->db->write("alter table Thread add column karmaRank decimal(5,6) not null default 0");
$session->db->write("alter table Thread add column karmaRank decimal(6,6) not null default 0");
}
#-------------------------------------------------

3
lib/WebGUI/Asset.pm
View file

@ -851,9 +851,10 @@ sub getToolbar {
return undef unless $self->canEdit;
return $self->{_toolbar} if (exists $self->{_toolbar});
my $i18n = WebGUI::International->new($self->session, "Asset");
my $toolbar = $self->session->icon->delete('func=delete',$self->get("url"),$i18n->get(43));
my $toolbar = "";
my $commit;
if ($self->canEditIfLocked) {
$toolbar .= $self->session->icon->delete('func=delete',$self->get("url"),$i18n->get(43));
$toolbar .= $self->session->icon->edit('func=edit',$self->get("url"));
} else {
$toolbar .= $self->session->icon->locked('func=manageRevisions',$self->get("url"));

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

@ -702,7 +702,6 @@ sub processPropertiesFromFormPost {
}
}
}
$self->session->form->process("proceed") = "redirectToParent";
# clear some cache
WebGUI::Cache->new($self->session,"wobject_".$self->getThread->getParent->getId."_".$self->session->user->userId)->delete;
WebGUI::Cache->new($self->session,"cspost_".($self->getParent->getId)."_".$self->session->user->userId."_".$self->session->scratch->get("discussionLayout")."_1")->delete;
@ -996,6 +995,7 @@ sub www_edit {
});
} elsif ($self->session->form->process("class") eq "WebGUI::Asset::Post::Thread") { # new thread
return $self->session->privilege->insufficient() unless ($self->getThread->getParent->canPost);
$var{'form.header'} .= WebGUI::Form::hidden($self->session, {name=>"proceed", value=>"redirectToParent"});
$var{isNewThread} = 1;
if ($self->getThread->getParent->canModerate) {
$var{'sticky.form'} = WebGUI::Form::yesNo($self->session, {

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

@ -212,7 +212,7 @@ sub getNextThread {
my $self = shift;
unless (defined $self->{_next}) {
my $sortBy = $self->getParent->getValue("sortBy");
my ($id, $class, $version) = $self->session->db->quickArray("
my ($id, $class, $version) = $self->session->dbSlave->quickArray("
select asset.assetId,asset.className,max(assetData.revisionDate)
from Thread
left join asset on asset.assetId=Thread.assetId
@ -229,7 +229,7 @@ sub getNextThread {
)
group by assetData.assetId
order by ".$sortBy." asc
",$self->session->dbSlave);
");
$self->{_next} = WebGUI::Asset->new($self->session, $id,$class,$version);
# delete $self->{_next} unless ($self->{_next}->{_properties}{className} =~ /Thread/);
};
@ -263,7 +263,7 @@ sub getPreviousThread {
my $self = shift;
unless (defined $self->{_previous}) {
my $sortBy = $self->getParent->getValue("sortBy");
my ($id, $class, $version) = $self->session->db->quickArray("
my ($id, $class, $version) = $self->session->dbSlave->quickArray("
select asset.assetId,asset.className,max(assetData.revisionDate)
from Thread
left join asset on asset.assetId=Thread.assetId
@ -279,7 +279,7 @@ sub getPreviousThread {
or (assetData.ownerUserId=".$self->session->db->quote($self->session->user->userId)." and assetData.ownerUserId<>'1')
)
group by assetData.assetId
order by ".$sortBy." desc, assetData.revisionDate desc ",$self->session->dbSlave);
order by ".$sortBy." desc, assetData.revisionDate desc ");
$self->{_previous} = WebGUI::Asset::Post::Thread->new($self->session, $id,$class,$version);
# delete $self->{_previous} unless ($self->{_previous}->{_properties}{className} =~ /Thread/);
};
@ -737,8 +737,8 @@ sub view {
$var->{'unsubscribe.url'} = $self->getUnsubscribeUrl;
$var->{'isArchived'} = $self->get("status") eq "archived";
$var->{'archive.url'} = $self->getArchivedUrl;
$var->{'unarchive.url'} = $self->getUnarchivedUrl;
$var->{'archive.url'} = $self->getArchiveUrl;
$var->{'unarchive.url'} = $self->getUnarchiveUrl;
$var->{'isSticky'} = $self->isSticky;
$var->{'stick.url'} = $self->getStickUrl;