oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Made file upload use the Form API instead of the Storage API due to name hacks

Browse source
This commit is contained in:
Colin Kuskie 2007-03-06 03:43:48 +00:00
parent 6f441d69c3
commit 57fc140369
5 changed files with 15 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

1
docs/changelog/7.x.x.txt
View file

@ -15,6 +15,7 @@
- fix: Fixed the left column template, which still used the RawHeadTags - fix: Fixed the left column template, which still used the RawHeadTags
macro. (perlDreamer Consulting, LLC) macro. (perlDreamer Consulting, LLC)
- Fixed a bad module name in the updated WeatherData asset (perlDreamer Consulting, LLC) - Fixed a bad module name in the updated WeatherData asset (perlDreamer Consulting, LLC)
- File and Image handling via Storage.pm (perlDreamer Consulting, LLC)
7.3.11 7.3.11
- Added an option for enabling coverage tests to testCodebase.pl. - Added an option for enabling coverage tests to testCodebase.pl.

8
lib/WebGUI/Asset/File.pm
View file

@ -245,13 +245,11 @@ sub processPropertiesFromFormPost {
my $self = shift; my $self = shift;
$self->SUPER::processPropertiesFromFormPost; $self->SUPER::processPropertiesFromFormPost;
delete $self->{_storageLocation}; delete $self->{_storageLocation};
my $storage = $self->getStorageLocation;
##The file form element adds a _file to each input name. my $fileStorageId = WebGUI::Form::File->new($self->session,{name => 'file'})->getValueFromPost;
##This thing should really try to use the whole Form API, but that's a major my $storage = WebGUI::Storage->get($self->session, $fileStorageId);
##change to this Asset
my $filename = $storage->addFileFromFormPost("file_file",1);
$storage->setPrivileges($self->get('ownerUserId'), $self->get('groupIdView'), $self->get('groupIdEdit')); $storage->setPrivileges($self->get('ownerUserId'), $self->get('groupIdView'), $self->get('groupIdEdit'));
my $filename = $storage->getFiles()->[0];
if (defined $filename && $filename ne $self->get("filename")) { if (defined $filename && $filename ne $self->get("filename")) {
my %data; my %data;
$data{filename} = $filename; $data{filename} = $filename;

4
lib/WebGUI/Asset/FilePile.pm
View file

@ -136,10 +136,10 @@ sub edit {
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub editSave { sub editSave {
my $self = shift; my $self = shift;
my $tempStorage = WebGUI::Storage->create($self->session);
##This is a hack. File uploads should go through the WebGUI::Form::File API ##This is a hack. File uploads should go through the WebGUI::Form::File API
$tempStorage->addFileFromFormPost("file_file"); my $tempFileStorageId = WebGUI::Form::File->new($self->session,{name => 'file'})->getValueFromPost;
my $tempStorage = WebGUI::Storage->get($self->session, $tempFileStorageId);
foreach my $filename (@{$tempStorage->getFiles}) { foreach my $filename (@{$tempStorage->getFiles}) {
my $storage = WebGUI::Storage::Image->create($self->session); my $storage = WebGUI::Storage::Image->create($self->session);

7
lib/WebGUI/Asset/Wobject/Matrix.pm
View file

@ -700,13 +700,18 @@ sub www_editListingSave {
##This is a hack. File upload should go throught the WebGUI::Form::File API ##This is a hack. File upload should go throught the WebGUI::Form::File API
##so that future changes don't affect us like this ##so that future changes don't affect us like this
my $screenshot = $storage->addFileFromFormPost("screenshot_file"); my $screenshotStorageId = WebGUI::Form::File->new($self->session,{name => 'screenshot'})->getValueFromPost;
my $uploadedScreenshot = WebGUI::Storage->get($self->session, $screenshotStorageId);
my $screenshot = $uploadedScreenshot->addFileFromFormPost("screenshot");
if (defined $screenshot) { if (defined $screenshot) {
$data{filename} = $screenshot; $data{filename} = $screenshot;
$storage->generateThumbnail($screenshot); $storage->generateThumbnail($screenshot);
$storage->addFileFromFilesystem($uploadedScreenshot->getPath($screenshot));
} }
$uploadedScreenshot->delete;
my $productName = $self->session->form->process("productName"); my $productName = $self->session->form->process("productName");
my $isNew = 0; my $isNew = 0;

7
lib/WebGUI/Operation/Graphics.pm
View file

@ -260,11 +260,10 @@ sub www_editFontSave {
return $session->privilege->adminOnly() unless ($session->user->isInGroup(3)); return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
if ($session->form->process('fid') eq 'new') { if ($session->form->process('fid') eq 'new') {
my $storage = WebGUI::Storage->create($session, 'new');
##This is a hack. It should use the WebGUI::Form::File API to insulate my $fileStorageId = WebGUI::Form::File->new($self->session,{name => 'fontFile'})->getValueFromPost;
##us from future form name changes. my $storage = WebGUI::Storage->get($self->session, $fileStorageId);
my $filename = $storage->addFileFromFormPost('fontFile_file'); my $filename = $storage->getFiles()->[0];
if ($filename) { if ($filename) {
my $font = WebGUI::Image::Font->new($session, 'new'); my $font = WebGUI::Image::Font->new($session, 'new');