Merge up to 10305

This commit is contained in:
Colin Kuskie 2009-04-13 17:04:23 +00:00
parent fa2e5c2c90
commit 1edaca4ed2
65 changed files with 1300 additions and 477 deletions

View file

@ -220,6 +220,13 @@ sub definition {
}
#-------------------------------------------------------------------
=head2 getEditForm ( )
Manually make the edit form due to javascript for adding more queries.
=cut
sub getEditForm {
my $self = shift;
my $tabform = $self->SUPER::getEditForm();
@ -495,6 +502,14 @@ sub purgeCache {
}
#-------------------------------------------------------------------
=head2 view ( )
See WebGUI::Asset::view() for details. This method also performs content caching
if the user is not in Admin Mode.
=cut
sub view {
my $self = shift;
if (!$self->session->var->isAdminOn && $self->get("cacheTimeout") > 10) {