From 18c36b73709b9e8ebb99afb622c4efd906f0e4c5 Mon Sep 17 00:00:00 2001 From: xianlin Date: Thu, 14 Oct 2021 17:41:25 +0800 Subject: [PATCH 1/2] Fix bug where Edit command does not edit a Persons note --- src/main/java/seedu/address/logic/commands/EditCommand.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/seedu/address/logic/commands/EditCommand.java b/src/main/java/seedu/address/logic/commands/EditCommand.java index f746d9f07ad..ab9cebceac3 100644 --- a/src/main/java/seedu/address/logic/commands/EditCommand.java +++ b/src/main/java/seedu/address/logic/commands/EditCommand.java @@ -169,7 +169,7 @@ public EditPersonDescriptor(EditPersonDescriptor toCopy) { * Returns true if at least one field is edited. */ public boolean isAnyFieldEdited() { - return CollectionUtil.isAnyNonNull(name, phone, email, address, tags); + return CollectionUtil.isAnyNonNull(name, phone, email, address, tags, note); } public void setName(Name name) { From d5130307d4699be1a89e987c7348446df5e695db Mon Sep 17 00:00:00 2001 From: xianlin Date: Thu, 14 Oct 2021 17:52:15 +0800 Subject: [PATCH 2/2] Fix typo that occurred when resolving merge conflict --- src/main/java/seedu/address/logic/commands/EditCommand.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/seedu/address/logic/commands/EditCommand.java b/src/main/java/seedu/address/logic/commands/EditCommand.java index b4cfe04184b..02e9d43b268 100644 --- a/src/main/java/seedu/address/logic/commands/EditCommand.java +++ b/src/main/java/seedu/address/logic/commands/EditCommand.java @@ -171,7 +171,7 @@ public EditPersonDescriptor(EditPersonDescriptor toCopy) { * Returns true if at least one field is edited. */ public boolean isAnyFieldEdited() { - return CollectionUtil.isAnyNonNull(name, phone, email, address, tags, insurance, note); + return CollectionUtil.isAnyNonNull(name, phone, email, address, tags, insurances, note); } public void setName(Name name) {