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

@ -41,6 +41,14 @@ use WebGUI::DateTime;
=head1 Methods
=cut
####################################################################
=head2 addRevision ( )
Extent the method from the super class to handle iCalSequenceNumbers.
=cut
sub addRevision {
@ -1698,6 +1706,12 @@ sub processPropertiesFromFormPost {
#-------------------------------------------------------------------
=head2 purge ( )
Extent the method from the super class to delete all storage locations.
=cut
sub purge {
my $self = shift;
my $sth = $self->session->db->read("select storageId from Event where assetId=?",[$self->getId]);
@ -1711,6 +1725,12 @@ sub purge {
#-------------------------------------------------------------------
=head2 purgeRevision ( )
Extent the method from the super class to delete the storage location for this revision.
=cut
sub purgeRevision {
my $self = shift;
$self->getStorageLocation->delete;
@ -1908,6 +1928,13 @@ sub view {
#-------------------------------------------------------------------
=head2 www_deleteFile ( )
Delete a file given in the form variable "filename" from the storage location.
=cut
sub www_deleteFile {
my $self = shift;
$self->getStorageLocation->deleteFile($self->session->form->process("filename")) if $self->canEdit;