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

There's no need to check again if the asset exists when importing asset collateral data. Fixes bug #12060.

Browse source
This commit is contained in:
Colin Kuskie 2011-03-07 16:31:19 -08:00
parent 23b403dd3f
commit 41ebf01199
2 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -9,6 +9,7 @@
- fixed #12055: Thingy pagination breaks after editing data - fixed #12055: Thingy pagination breaks after editing data
- fixed #12066: Thingy CSV export overrides ExportHTML - fixed #12066: Thingy CSV export overrides ExportHTML
- fixed #12068: www_editSave not strict enough in permission checks - fixed #12068: www_editSave not strict enough in permission checks
- fixed #12060: Thingy: importAssetCollateralData and asset checking
7.10.10 7.10.10
- fixed #12035: Story Manager - make keywords from Story view work - fixed #12035: Story Manager - make keywords from Story view work

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

@ -1367,10 +1367,6 @@ sub importAssetCollateralData {
my $session = $self->session; my $session = $self->session;
my $error = $session->errorHandler; my $error = $session->errorHandler;
my $data = shift; my $data = shift;
my $id = $data->{properties}{assetId};
my $class = $data->{properties}{className};
my $version = $data->{properties}{revisionDate};
my $assetExists = WebGUI::Asset->assetExists($self->session, $id, $class, $version);
$error->info("Importing Things for Thingy ".$data->{properties}{title}); $error->info("Importing Things for Thingy ".$data->{properties}{title});
my @importThings; my @importThings;
@ -1378,7 +1374,7 @@ sub importAssetCollateralData {
push(@importThings,$thing->{thingId}); push(@importThings,$thing->{thingId});
my ($thingIdExists) = $session->db->quickArray("select thingId from Thingy_things where thingId = ?", my ($thingIdExists) = $session->db->quickArray("select thingId from Thingy_things where thingId = ?",
[$thing->{thingId}]); [$thing->{thingId}]);
if ($assetExists && $thingIdExists){ if ($thingIdExists){
# update existing thing # update existing thing
$error->info("Updating Thing, label: ".$thing->{label}.", id: ".$thing->{thingId}); $error->info("Updating Thing, label: ".$thing->{label}.", id: ".$thing->{thingId});
$self->setCollateral("Thingy_things","thingId",$thing,0,0); $self->setCollateral("Thingy_things","thingId",$thing,0,0);
@ -1402,7 +1398,7 @@ sub importAssetCollateralData {
push(@importFields,$field->{fieldId}); push(@importFields,$field->{fieldId});
my $dbDataType = $self->_getDbDataType($field->{fieldType}); my $dbDataType = $self->_getDbDataType($field->{fieldType});
my ($fieldIdExists) = $session->db->quickArray("select fieldId from Thingy_fields where fieldId = ? and thingId = ? ",[$field->{fieldId},$field->{thingId}]); my ($fieldIdExists) = $session->db->quickArray("select fieldId from Thingy_fields where fieldId = ? and thingId = ? ",[$field->{fieldId},$field->{thingId}]);
if ($assetExists && $fieldIdExists){ if ($fieldIdExists){
# update existing field # update existing field
$error->info("Updating Field, label: ".$field->{label}.", id: ".$field->{fieldId}.",seq :" $error->info("Updating Field, label: ".$field->{label}.", id: ".$field->{fieldId}.",seq :"
.$field->{sequenceNumber}); .$field->{sequenceNumber});