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

forward port of File/Image - Storage/Storage::Image object alignment fix

Browse source
This commit is contained in:
Colin Kuskie 2007-06-22 23:26:13 +00:00
parent 4de39b7fe5
commit 522d87fed2
2 changed files with 21 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -279,7 +279,7 @@ sub processPropertiesFromFormPost {
$data{title} = $filename unless ($session->form->process("title")); $data{title} = $filename unless ($session->form->process("title"));
$data{menuTitle} = $filename unless ($session->form->process("menuTitle")); $data{menuTitle} = $filename unless ($session->form->process("menuTitle"));
$data{url} = $self->getParent->get('url').'/'.$filename unless ($session->form->process("url")); $data{url} = $self->getParent->get('url').'/'.$filename unless ($session->form->process("url"));
$self->{_storageLocation} = $storage; $self->setStorageLocation($storage);
$self->update(\%data); $self->update(\%data);
} }
} }
@ -336,11 +336,16 @@ sub setSize {
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub setStorageLocation { sub setStorageLocation {
my $self = shift; my $self = shift;
if ($self->get("storageId") eq "") { my $storage = shift;
if (defined $storage) {
$self->{_storageLocation} = $storage;
}
elsif ($self->get("storageId") eq "") {
$self->{_storageLocation} = WebGUI::Storage->create($self->session); $self->{_storageLocation} = WebGUI::Storage->create($self->session);
$self->update({storageId=>$self->{_storageLocation}->getId}); $self->update({storageId=>$self->{_storageLocation}->getId});
} else { }
else {
$self->{_storageLocation} = WebGUI::Storage->get($self->session,$self->get("storageId")); $self->{_storageLocation} = WebGUI::Storage->get($self->session,$self->get("storageId"));
} }
} }

16
lib/WebGUI/Asset/File/Image.pm
View file

@ -207,7 +207,10 @@ sub processPropertiesFromFormPost {
unless ($parameters =~ /alt\=/) { unless ($parameters =~ /alt\=/) {
$self->update({parameters=>$parameters.' alt="'.$self->get("title").'"'}); $self->update({parameters=>$parameters.' alt="'.$self->get("title").'"'});
} }
my $storage = $self->getStorageLocation; ##We just inherited a storage object of the wrong type. Reinstance the same
##storage object with the correct type
my $storage = WebGUI::Storage::Image->get($self->session, $self->getStorageLocation->getId);
$self->setStorageLocation($storage);
my $max_size = $self->session->setting->get("maxImageSize"); my $max_size = $self->session->setting->get("maxImageSize");
my $file = $self->get("filename"); my $file = $self->get("filename");
my ($w, $h) = $storage->getSizeInPixels($file); my ($w, $h) = $storage->getSizeInPixels($file);
@ -225,11 +228,16 @@ sub processPropertiesFromFormPost {
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub setStorageLocation { sub setStorageLocation {
my $self = shift; my $self = shift;
if ($self->get("storageId") eq "") { my $storage = shift;
if (defined $storage) {
$self->{_storageLocation} = $storage;
}
elsif ($self->get("storageId") eq "") {
$self->{_storageLocation} = WebGUI::Storage::Image->create($self->session); $self->{_storageLocation} = WebGUI::Storage::Image->create($self->session);
$self->update({storageId=>$self->{_storageLocation}->getId}); $self->update({storageId=>$self->{_storageLocation}->getId});
} else { }
else {
$self->{_storageLocation} = WebGUI::Storage::Image->get($self->session,$self->get("storageId")); $self->{_storageLocation} = WebGUI::Storage::Image->get($self->session,$self->get("storageId"));
} }
} }