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

several bug fixes

Browse source
This commit is contained in:
JT Smith 2005-02-22 02:05:55 +00:00
parent 22d3df0749
commit decab22c2f
9 changed files with 352 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/WebGUI/Asset/Event.pm
View file

@ -43,7 +43,7 @@ sub definition {
my $class = shift;
my $definition = shift;
push(@{$definition}, {
tableName=>'EventsCalendar_Event',
tableName=>'EventsCalendar_event',
className=>'WebGUI::Asset::Event',
properties=>{
description => {
@ -392,7 +392,7 @@ sub www_deleteEventConfirm {
my $self = shift;
return WebGUI::Privilege::insufficient() unless ($self->canEdit);
if ($session{form}{rid} ne "") {
my $where = "EventsCalendar_Event.EventsCalendar_recurringId=".quote($session{form}{rid});
my $where = "EventsCalendar_event.EventsCalendar_recurringId=".quote($session{form}{rid});
my $series = $self->getParent->getLineage(["descendants"],{returnObjects=>1,
joinClass=>"WebGUI::Asset::Event",whereClause=>$where});
foreach my $trashedEvent (@{$series}) {

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

@ -157,7 +157,6 @@ sub definition {
sub DESTROY {
my $self = shift;
$self->{_thread}->DESTROY if (exists $self->{_thread});
$self->{_storageLocation}->DESTROY if (exists $self->{_storageLocation});
$self->SUPER::DESTROY;
}

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

@ -186,6 +186,7 @@ sub getNextThread {
order by ".$self->getParent->getValue("sortBy")." asc
",WebGUI::SQL->getSlave)
);
delete $self->{_next} unless ($self->{_next}->{_properties}{className} =~ /Thread/);
};
return $self->{_next};
}
@ -218,6 +219,7 @@ sub getPreviousThread {
)
order by ".$self->getParent->getValue("sortBy")." desc ",WebGUI::SQL->getSlave)
);
delete $self->{_previous} unless ($self->{_previous}->{_properties}{className} =~ /Thread/);
};
return $self->{_previous};
}

1
lib/WebGUI/Asset/Wobject/EventsCalendar.pm
View file

@ -217,7 +217,6 @@ sub view {
my $self = shift;
return WebGUI::Privilege::noAccess() unless $self->canView;
#define default view month range. Note that this could be different from
#the range a user is allowed to view - set by the events calendar limitations.
my $monthRangeLength = int($self->getValue("paginateAfter"));

4
lib/WebGUI/Asset/Wobject/Layout.pm
View file

@ -156,7 +156,7 @@ sub view {
push(@{$vars{"position".$i."_loop"}},{
id=>$child->getId,
content=>$child->view
});
}) if $child->canView;
push(@found, $child->getId);
}
}
@ -169,7 +169,7 @@ sub view {
push(@{$vars{"position1_loop"}},{
id=>$child->getId,
content=>$child->view
});
}) if $child->canView;
}
}
$vars{showAdmin} = ($session{var}{adminOn} && $self->canEdit);

8
lib/WebGUI/Asset/Wobject/Navigation.pm
View file

@ -272,19 +272,19 @@ sub view {
my $skip = 0;
my $pageLineage = $asset->get("lineage");
foreach my $lineage (@linesToSkip) {
$skip = 1 if ($lineage =~ m/^$pageLineage/);
$skip = 1 if ($pageLineage =~ m/^$lineage/);
}
next if ($skip);
if ($asset->get("isHidden") && !$self->get("showHiddenPages")) {
push (@linesToSkip,$asset->getId);
push (@linesToSkip,$asset->get("lineage")) unless ($asset->get("lineage") eq "000001");
next;
}
if ($asset->get("isSystem") && !$self->get("showSystemPages")) {
push (@linesToSkip,$asset->getId);
push (@linesToSkip,$asset->get("lineage")) unless ($asset->get("lineage") eq "000001");
next;
}
unless ($self->get("showUnprivilegedPages") || $asset->canView) {
push (@linesToSkip,$asset->getId);
push (@linesToSkip,$asset->get("lineage")) unless ($asset->get("lineage") eq "000001");
next;
}
my $pageData = {};