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

Fix two issues with sub deleteAttachedFiles that were preventing

Browse source 
it from being purged from the trash.
This commit is contained in:
Colin Kuskie 2008-07-26 02:28:56 +00:00
parent 6db3fc1005
commit d95ba6c8da
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,5 @@
7.5.19 7.5.19
- fixed: unable to purge trash
7.5.18 7.5.18
- fixed: Collateral Image Manager broken in Firefox 3 - fixed: Collateral Image Manager broken in Firefox 3

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

@ -462,10 +462,9 @@ sub deleteAttachedFiles {
} }
else { else {
my $entries = $self->session->db->buildArrayRef("select entryData from DataForm_entry where assetId=?", [$self->getId]); my $entries = $self->session->db->buildArrayRef("select entryData from DataForm_entry where assetId=?", [$self->getId]);
foreach my $entry (@$entries) { foreach my $entry (@{ $entries}) {
my $entryData = decode_json($entry->{entryData}); my $entryData = decode_json($entry);
$self->deleteEntryFiles($entryData); for my $field (@{ $fields }) {
for my $field ( @$fields ) {
my $form = $self->_createForm($fieldConfig->{$field}, $entryData->{$field}); my $form = $self->_createForm($fieldConfig->{$field}, $entryData->{$field});
if ($form->can('getStorageLocation')) { if ($form->can('getStorageLocation')) {
my $storage = $form->getStorageLocation; my $storage = $form->getStorageLocation;