# Fixed not updating relations without softdelete when main model had…

… soft delete
bpanatta · May 15, 2018 · c9d82a9 · c9d82a9
1 parent 0748d41
commit c9d82a9
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/RelationTrait.php b/RelationTrait.php
@@ -210,7 +210,7 @@ public function saveAll($skippedRelations = [])
                                             array_push($query, $notIn);
                                         }
                                         try {
-                                            if ($isSoftDelete) {
+                                            if ($isSoftDelete && isset($relModel->_rt_softdelete)) {
                                                 $relModel->updateAll($this->_rt_softdelete, $query);
                                             } else {
                                                 $relModel->deleteAll($query);
@@ -224,7 +224,7 @@ public function saveAll($skippedRelations = [])
                                         $query = ['and', $notDeletedFK, ['not in', $relPKAttr[0], $notDeletedPK]];
                                         if (!empty($notDeletedPK)) {
                                             try {
-                                                if ($isSoftDelete) {
+                                                if ($isSoftDelete && isset($relModel->_rt_softdelete)) {
                                                     $relModel->updateAll($this->_rt_softdelete, $query);
                                                 } else {
                                                     $relModel->deleteAll($query);
@@ -288,7 +288,7 @@ public function saveAll($skippedRelations = [])
                                 $condition[$k] = $this->$v;
                             }
                             try {
-                                if ($isSoftDelete) {
+                                if ($isSoftDelete && isset($relModel->_rt_softdelete)) {
                                     $relModel->updateAll($this->_rt_softdelete, ['and', $condition]);
                                 } else {
                                     $relModel->deleteAll(['and', $condition]);
@@ -303,7 +303,7 @@ public function saveAll($skippedRelations = [])
                                     $condition[$k] = $this->$v;
                                 }
                                 try {
-                                    if ($isSoftDelete) {
+                                    if ($isSoftDelete && isset($relModel->_rt_softdelete)) {
                                         $relModel->updateAll($this->_rt_softdelete, ['and', $condition]);
                                     } else {
                                         $relModel->deleteAll(['and', $condition]);