Merge pull request #3 from ssntpl/datafield_deletion_recursively

JYOTSANASHARMAA · web-flow · commit ce6232e2efa7 · 2025-10-08T23:04:45.000+05:30
deleting datafields and its files recursively
diff --git a/src/Models/DataField.php b/src/Models/DataField.php
@@ -75,14 +75,13 @@ public function owner()
 
     public function delete()
     {
+        $dataFieldFiles = $this->files()->get();
+        foreach($dataFieldFiles as $file) {
+            $file->delete();
+        }
         $dataFields = $this->fields()->get();
         foreach($dataFields as $dataField)
         {
-            $dataFieldFiles = $dataField->files()->get();
-            foreach($dataFieldFiles as $dataFieldFile)
-            {
-                $dataFieldFile->delete();
-            }
             $dataField->delete();
         }
         return parent::delete();

Original file line number	Diff line number	Diff line change
`@@ -75,14 +75,13 @@ public function owner()`
`75`	`75`
`76`	`76`	`public function delete()`
`77`	`77`	`{`
	`78`	`+ $dataFieldFiles = $this->files()->get();`
	`79`	`+ foreach($dataFieldFiles as $file) {`
	`80`	`+ $file->delete();`
	`81`	`+ }`
`78`	`82`	`$dataFields = $this->fields()->get();`
`79`	`83`	`foreach($dataFields as $dataField)`
`80`	`84`	`{`
`81`		`- $dataFieldFiles = $dataField->files()->get();`
`82`		`- foreach($dataFieldFiles as $dataFieldFile)`
`83`		`- {`
`84`		`- $dataFieldFile->delete();`
`85`		`- }`
`86`	`85`	`$dataField->delete();`
`87`	`86`	`}`
`88`	`87`	`return parent::delete();`