Changeset 1731 for branches/release-33/lib/MT/Entry.pm

Timestamp:

04/02/08 23:27:20 (20 months ago)

Author:

bchoate

Message:

Adding embedded column to MT::ObjectAsset. BugId:71500. Thanks, Tim!

Files:

• branches/release-33/lib/MT/Entry.pm (modified) (4 diffs)

branches/release-33/lib/MT/Entry.pm

@@ -622 +622 @@
         object_id => $entry->id,
         blog_id => $entry->blog_id,
-        object_ds => $entry->datasource
+        object_ds => $entry->datasource,
+        embedded => 1,
     });
     my %assets = map { $_->asset_id => $_->id } @assets;
@@ -629 +630 @@
         my $innards = $2;
 
-        # is asset exists?
-        my $asset = MT->model('asset')->load({ id => $id }) or next;
-
         # reference to an existing asset...
         if (exists $assets{$id}) {
             $assets{$id} = 0;
         } else {
+            # is asset exists?
+            my $asset = MT->model('asset')->load({ id => $id }) or next;
+
             my $map = new MT::ObjectAsset;
             $map->blog_id($entry->blog_id);
@@ -641 +642 @@
             $map->object_ds($entry->datasource);
             $map->object_id($entry->id);
+            $map->embedded(1);
             $map->save;
             $assets{$id} = 0;
@@ -646 +648 @@
     }
     if (my @old_maps = grep { $assets{$_->asset_id} } @assets) {
-        my @old_ids = map { $_->id } @old_maps;
-        MT::ObjectAsset->remove( { id => \@old_ids });
+        my @old_ids = map { $_->id } grep { $_->embedded } @old_maps;
+        MT::ObjectAsset->remove( { id => \@old_ids })
+            if @old_ids;
     }
     return 1;