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

Fix duplicating and deleting thing data. Fixes bug #11391

Browse source
This commit is contained in:
Colin Kuskie 2010-02-08 14:38:37 -08:00
parent bb26647734
commit bdccf5829b
2 changed files with 50 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,5 +1,6 @@
7.8.12 7.8.12
- fixed #11390: Meta description duplicated in asset Folder - fixed #11390: Meta description duplicated in asset Folder
- fixed #11391: Duplicated Thingy maintains ids for storage fields
7.8.11 7.8.11
- fixed #11362: Unable to checkout with ITransact plugin - fixed #11362: Unable to checkout with ITransact plugin

58
lib/WebGUI/Asset/Wobject/Thingy.pm
View file

@ -437,13 +437,37 @@ The id of row of data that should be copied.
=cut =cut
sub copyThingData { sub copyThingData {
my $self = shift; my $self = shift;
my $thingId = shift; my $thingId = shift;
my $thingDataId = shift; my $thingDataId = shift;
my $db = $self->session->db; my $session = $self->session;
return undef unless $self->canEditThingData($thingId, $thingDataId);; my $db = $session->db;
return undef unless $self->canEditThingData($thingId, $thingDataId);
$self->copyCollateral("Thingy_".$thingId,"thingDataId",$thingDataId); my $origCollateral = $self->getCollateral("Thingy_".$thingId, "thingDataId", $thingDataId);
use Data::Dumper;
$session->log->warn(Dumper $origCollateral);
$origCollateral->{thingDataId} = "new";
##Get all fields
my $fields = $db->buildArrayRefOfHashRefs('select * from Thingy_fields where assetId=? and thingId=?'
,[$self->getId,$thingId]);
my @storage_field_ids = ();
##Check to see if any of them are File or Image
foreach my $field (@{ $fields }) {
if ($field->{fieldType} eq 'File' or $field->{fieldType} eq 'Image') {
push @storage_field_ids, $field->{fieldId};
}
}
##Instance the storage object and duplicate it
foreach my $fieldId (@storage_field_ids) {
my $currentId = $origCollateral->{"field_". $fieldId};
my $storage = WebGUI::Storage->get($session, $currentId);
my $new_store = $storage->copy;
##Update the copy with the new storageId.
$origCollateral->{"field_". $fieldId} = $new_store->getId;
}
##Update the copy
$self->setCollateral("Thingy_".$thingId, "thingDataId", $origCollateral, 0, 0);
return undef; return undef;
} }
@ -467,12 +491,13 @@ The id of row of data that should be deleted.
sub deleteThingData { sub deleteThingData {
my $self = shift; my $self = shift;
my $thingId = shift; my $thingId = shift;
my $thingDataId = shift; my $thingDataId = shift;
my $db = $self->session->db; my $session = $self->session;
my $db = $session->db;
return undef unless $self->canEditThingData($thingId, $thingDataId);; return undef unless $self->canEditThingData($thingId, $thingDataId);
my ($onDeleteWorkflowId) = $db->quickArray("select onDeleteWorkflowId from Thingy_things where thingId=?" my ($onDeleteWorkflowId) = $db->quickArray("select onDeleteWorkflowId from Thingy_things where thingId=?"
,[$thingId]); ,[$thingId]);
@ -480,7 +505,22 @@ sub deleteThingData {
$self->triggerWorkflow($onDeleteWorkflowId, $thingId,$thingDataId); $self->triggerWorkflow($onDeleteWorkflowId, $thingId,$thingDataId);
} }
my $origCollateral = $self->getCollateral("Thingy_".$thingId, "thingDataId", $thingDataId);
$self->deleteCollateral("Thingy_".$thingId,"thingDataId",$thingDataId); $self->deleteCollateral("Thingy_".$thingId,"thingDataId",$thingDataId);
my $fields = $db->buildArrayRefOfHashRefs('select * from Thingy_fields where assetId=? and thingId=?'
,[$self->getId,$thingId]);
my @storage_field_ids = ();
##Check to see if any of them are File or Image
foreach my $field (@{ $fields }) {
if ($field->{fieldType} eq 'File' or $field->{fieldType} eq 'Image') {
push @storage_field_ids, $field->{fieldId};
}
}
foreach my $fieldId (@storage_field_ids) {
my $currentId = $origCollateral->{"field_". $fieldId};
my $storage = WebGUI::Storage->get($session, $currentId);
$storage->delete;
}
return undef; return undef;
} }