more asset manager changes

This commit is contained in:
JT Smith 2004-12-21 04:33:26 +00:00
parent 9d5353cf8f
commit 95bac10986
15 changed files with 247 additions and 99 deletions

View file

@ -98,13 +98,14 @@ sub getEditForm {
my $self = shift;
my $tabform = $self->SUPER::getEditForm();
if ($self->get("filename") ne "") {
my $storage = WebGUI::Storage->new($self->get("storageId"));
my $storage = WebGUI::Storage->get($self->get("storageId"));
}
$tabform->getTab("properties")->url(
$tabform->getTab("properties")->file(
-name=>"file",
-label=>"File To Upload"
);
return $tabform;
}
@ -113,7 +114,7 @@ sub getIcon {
my $self = shift;
my $small = shift;
if ($small) {
my $storage = WebGUI::Storage->new($self->get("storageId"));
my $storage = WebGUI::Storage->get($self->get("storageId"));
return $storage->getFileIconUrl($self->get("filename"));
}
return $session{config}{extrasURL}.'/assets/file.gif';
@ -144,15 +145,25 @@ sub purge {
my @old = split("\n",$self->get("olderVersions"));
foreach my $oldone (@old) {
my ($storageId, $filename) = split("|",$oldone);
my $storage = WebGUI::Storage->new($storageId);
my $storage = WebGUI::Storage->get($storageId);
$storage->delete;
}
my $storage = WebGUI::Storage->new($self->get("storageId"));
my $storage = WebGUI::Storage->get($self->get("storageId"));
$storage->delete;
return $self->SUPER::purge;
}
sub view {
my $self = shift;
if ($session{var}{adminOn}) {
return $self->www_edit;
}
my $storage = WebGUI::Storage->get($self->get("storageId"));
WebGUI::HTTP::setRedirect($storage->getUrl($self->get("filename")));
return "";
}
#-------------------------------------------------------------------
=head2 www_editSave
@ -185,24 +196,11 @@ sub www_editSave {
return $output;
}
#-------------------------------------------------------------------
=head2 www_view
A web executable method that redirects the user to the specified page, or displays the edit interface when admin mode is enabled.
=cut
sub www_view {
my $self = shift;
if ($session{var}{adminOn}) {
return $self->www_edit;
}
my $storage = WebGUI::Storage->new($self->get("storageId"));
WebGUI::HTTP::setRedirect($storage->getUrl($self->get("filename")));
return "";
}
#sub www_view {
# my $self = shift;
# return WebGUI::Privilege::noAccess() unless $self->canView;
# return $self->view;
#}
1;

View file

@ -149,6 +149,7 @@ sub getEditForm {
-value=>'<img src="'.$storage->getUrl($self->get("filename")).'" alt="thumbnail" />'
);
}
return $tabform;
}

View file

@ -458,7 +458,7 @@ sub getFileIconUrl {
if (-f $path) {
return $session{config}{extrasURL}."/fileIcons/".$extension.".gif";
}
return $session{config}{extrasURL}."/fileIcons/unkonwn.gif";
return $session{config}{extrasURL}."/fileIcons/unknown.gif";
}

View file

@ -20,6 +20,7 @@ use Tie::IxHash;
use WebGUI::Form;
use WebGUI::HTMLForm;
use WebGUI::Session;
use WebGUI::Style;
=head1 NAME
@ -214,11 +215,9 @@ Returns an HTML string with all the necessary components to draw the tab form.
sub print {
my $self = shift;
my $output = '
<script src="'.$session{config}{extrasURL}.'/tabs/tabs.js" type="text/javascript"></script>
<link href="'.$self->{_css}.'" rel="stylesheet" rev="stylesheet" type="text/css">
';
$output .= $self->{_form};
WebGUI::Style::setScript($session{config}{extrasURL}.'/tabs/tabs.js',{type=>"text/javascript"});
WebGUI::Style::setLink($self->{_css},{rel=>"stylesheet", rev=>"stylesheet",type=>"text/css"});
my $output = $self->{_form};
$output .= $self->{_hidden};
my $i = 1;
my $tabs;