merging 6.2.9 changes

This commit is contained in:
JT Smith 2004-11-19 22:59:25 +00:00
parent 1bb82bd7b9
commit 48caad2d74
42 changed files with 224 additions and 119 deletions

View file

@ -189,22 +189,6 @@ sub getEditForm {
-value=>$self->get("synopsis"),
-uiLevel=>3
);
my @data = WebGUI::DateTime::secondsToInterval($self->get("cacheTimeout"));
$tabform->getTab("properties")->interval(
-name=>"cacheTimeout",
-label=>WebGUI::International::get(895),
-intervalValue=>$data[0],
-unitsValue=>$data[1],
-uiLevel=>8
);
@data = WebGUI::DateTime::secondsToInterval($self->get("cacheTimeoutVisitor"));
$tabform->getTab("properties")->interval(
-name=>"cacheTimeoutVisitor",
-label=>WebGUI::International::get(896),
-intervalValue=>$data[0],
-unitsValue=>$data[1],
-uiLevel=>8
);
$tabform->add("privileges",WebGUI::International::get(107),6);
$tabform->getTab("privileges")->dateTime(
-name=>"startDate",
@ -262,6 +246,18 @@ sub getId {
return $self->get("assetId");
}
#-------------------------------------------------------------------
=head2 getIndexerParams ( )
Override this method and return a hash reference that includes the properties necessary to index the content of the wobject.
=cut
sub getIndexerParams {
return {};
}
sub getNextChildRank {
my $self = shift;
my ($lineage) = WebGUI::SQL->quickArray("select max(lineage) from asset where parentId=".quote($self->getId));
@ -352,6 +348,15 @@ sub getUiLevel {
return 0;
}
sub getValue {
my $self = shift;
my $key = shift;
if (defined $key) {
return $session{form}{$key} || $self->get($key);
}
return undef;
}
sub new {
my $class = shift;
my $assetId = shift;