Clean relations pre - trash.

KevinJump · Jun 29, 2021 · b1d671a · b1d671a
1 parent f41034d
commit b1d671a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/uSync8.ContentEdition/Serializers/ContentSerializer.cs b/uSync8.ContentEdition/Serializers/ContentSerializer.cs
@@ -333,9 +333,11 @@ protected override uSyncChange HandleTrashedState(IContent item, bool trashed)
             else if (trashed && !item.Trashed)
             {
                 // move to the recycle bin
-
                 logger.Debug<ContentSerializer>("Moving content into Recycle bin {id}", item.Id);
 
+                // clean any relations that may be there (stops an error)
+                CleanRelations(item, "relateParentDocumentOnDelete");
+
                 contentService.MoveToRecycleBin(item);
                 return uSyncChange.Update("Moved to Bin", item.Name, "", "Recycle Bin");
             }

diff --git a/uSync8.ContentEdition/Serializers/MediaSerializer.cs b/uSync8.ContentEdition/Serializers/MediaSerializer.cs
@@ -110,6 +110,10 @@ protected override uSyncChange HandleTrashedState(IMedia item, bool trashed)
             }
             else if (trashed && !item.Trashed)
             {
+
+                // clean any rouge relations 
+                CleanRelations(item, "relateParentMediaFolderOnDelete");
+
                 // move to the recycle bin
                 mediaService.MoveToRecycleBin(item);
                 return uSyncChange.Update("Moved to Bin", item.Name, "", "Recycle Bin");