From ed86c26a183955d57694f0960b52c14cf40fe149 Mon Sep 17 00:00:00 2001
From: James Cole <james@firefly-iii.org>
Date: Tue, 20 Oct 2020 04:42:44 +0200
Subject: [PATCH] Fix similar issue in piggies

---
 .../PiggyBank/ModifiesPiggyBanks.php            | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/app/Repositories/PiggyBank/ModifiesPiggyBanks.php b/app/Repositories/PiggyBank/ModifiesPiggyBanks.php
index 1c8eac52fc..3dc7c627ad 100644
--- a/app/Repositories/PiggyBank/ModifiesPiggyBanks.php
+++ b/app/Repositories/PiggyBank/ModifiesPiggyBanks.php
@@ -336,16 +336,16 @@ trait ModifiesPiggyBanks
      */
     public function update(PiggyBank $piggyBank, array $data): PiggyBank
     {
-        if (isset($data['name']) && '' !== $data['name']) {
+        if (array_key_exists('name', $data) && '' !== $data['name']) {
             $piggyBank->name = $data['name'];
         }
-        if (isset($data['account_id']) && 0 !== $data['account_id']) {
+        if (array_key_exists('account_id', $data) && 0 !== $data['account_id']) {
             $piggyBank->account_id = (int) $data['account_id'];
         }
-        if (isset($data['targetamount']) && '' !== $data['targetamount']) {
+        if (array_key_exists('targetamount', $data) && '' !== $data['targetamount']) {
             $piggyBank->targetamount = $data['targetamount'];
         }
-        if (isset($data['targetdate']) && '' !== $data['targetdate']) {
+        if (array_key_exists('targetdate', $data) && '' !== $data['targetdate']) {
             $piggyBank->targetdate = $data['targetdate'];
         }
         $piggyBank->startdate = $data['startdate'] ?? $piggyBank->startdate;
@@ -360,7 +360,6 @@ trait ModifiesPiggyBanks
             $this->updateOrder($piggyBank, $oldOrder, $newOrder);
         }
 
-
         // if the piggy bank is now smaller than the current relevant rep,
         // remove money from the rep.
         $repetition = $this->getRepetition($piggyBank);
@@ -380,7 +379,14 @@ trait ModifiesPiggyBanks
                 $piggyBank->objectGroups()->sync([$objectGroup->id]);
                 $piggyBank->save();
             }
+            return $piggyBank;
         }
+        // remove if name is empty. Should be overruled by ID.
+        if ('' === $objectGroupTitle) {
+            $piggyBank->objectGroups()->sync([]);
+            $piggyBank->save();
+        }
+
         // try also with ID:
         $objectGroupId = (int) ($data['object_group_id'] ?? 0);
         if (0 !== $objectGroupId) {
@@ -389,6 +395,7 @@ trait ModifiesPiggyBanks
                 $piggyBank->objectGroups()->sync([$objectGroup->id]);
                 $piggyBank->save();
             }
+            return $piggyBank;
         }
 
         return $piggyBank;