a whole pile of bug fixes
This commit is contained in:
parent
4ddc5d66ec
commit
a50fd5787a
18 changed files with 234 additions and 61 deletions
|
|
@ -1025,6 +1025,14 @@ sub _xml_encode {
|
|||
return $text;
|
||||
}
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
sub www_view {
|
||||
my $self = shift;
|
||||
my $disableCache = ($session{form}{sortBy} ne "");
|
||||
return $self->SUPER::www_view($disableCache);
|
||||
}
|
||||
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
# print out RSS 2.0 feed describing the items visible on the first page
|
||||
sub www_viewRSS {
|
||||
|
|
@ -1078,6 +1086,7 @@ sub www_viewRSS {
|
|||
|
||||
|
||||
|
||||
|
||||
1;
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -159,7 +159,7 @@ sub view {
|
|||
title=>$child->get("title"),
|
||||
synopsis=>$child->get("synopsis"),
|
||||
size=>WebGUI::Utility::formatBytes($child->get("assetSize")),
|
||||
"date.epoch"=>$child->get("dateStamp"),
|
||||
"date.epoch"=>$child->get("lastUpdated"),
|
||||
"icon.small"=>$child->getIcon(1),
|
||||
"icon.big"=>$child->getIcon,
|
||||
type=>$child->getName,
|
||||
|
|
|
|||
|
|
@ -387,6 +387,13 @@ sub www_edit {
|
|||
return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get("26","IndexedSearch"));
|
||||
}
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
sub www_view {
|
||||
my $self = shift;
|
||||
return $self->SUPER::www_view(1);
|
||||
}
|
||||
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
sub _buildPageList {
|
||||
my ($self, @userSpecifiedRoots, @roots, @allowedRoots, $pageId, @pages);
|
||||
|
|
|
|||
|
|
@ -340,8 +340,8 @@ sub view {
|
|||
$pageData->{"page.isChild"} = ($asset->get("parentId") eq $current->getId);
|
||||
$pageData->{"page.isParent"} = ($asset->getId eq $current->get("parentId"));
|
||||
$pageData->{"page.isCurrent"} = ($asset->getId eq $current->getId);
|
||||
$pageData->{"page.isDescendant"} = ( $currentLineage =~ m/^$pageLineage/ && !$pageData->{"page.isCurrent"});
|
||||
$pageData->{"page.isAnscestor"} = ( $pageLineage =~ m/^$currentLineage/ && !$pageData->{"page.isCurrent"});
|
||||
$pageData->{"page.isDescendant"} = ( $pageLineage =~ m/^$currentLineage/ && !$pageData->{"page.isCurrent"});
|
||||
$pageData->{"page.isAncestor"} = ( $currentLineage =~ m/^$pageLineage/ && !$pageData->{"page.isCurrent"});
|
||||
my $currentBranchLineage = substr($currentLineage,0,12);
|
||||
$pageData->{"page.inBranchRoot"} = ($currentBranchLineage =~ m/^$pageLineage/);
|
||||
$pageData->{"page.isSibling"} = (
|
||||
|
|
|
|||
|
|
@ -368,6 +368,7 @@ sub www_vote {
|
|||
$u = WebGUI::User->new($session{user}{userId});
|
||||
$u->karma($self->get("karmaPerVote"),"Poll (".$self->getId.")","Voted on this poll.");
|
||||
}
|
||||
$self->deletePageCache;
|
||||
}
|
||||
return $self->getContainer->www_view;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue