Merge pull request #45487 from nextcloud/fix/reset-notification-email

fix: Reset notification email when deleting additonal email
nextcloud · Aug 2, 2024 · 1a51afd · 1a51afd
2 parents 669e4e7 + 427c27a
commit 1a51afd
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/apps/provisioning_api/lib/Controller/UsersController.php b/apps/provisioning_api/lib/Controller/UsersController.php
@@ -838,6 +838,9 @@ public function editUserMultiValue(
 					}
 				}
 				$this->accountManager->updateAccount($userAccount);
+				if ($value === '' && $key === $targetUser->getPrimaryEMailAddress()) {
+					$targetUser->setPrimaryEMailAddress('');
+				}
 				break;
 
 			case IAccountManager::COLLECTION_EMAIL . self::SCOPE_SUFFIX:

diff --git a/apps/settings/src/components/PersonalInfo/EmailSection/Email.vue b/apps/settings/src/components/PersonalInfo/EmailSection/Email.vue
@@ -356,6 +356,9 @@ export default {
 		handleDeleteAdditionalEmail(status) {
 			if (status === 'ok') {
 				this.$emit('delete-additional-email')
+				if (this.isNotificationEmail) {
+					this.$emit('update:notification-email', '')
+				}
 			} else {
 				this.handleResponse({
 					errorMessage: t('settings', 'Unable to delete additional email address'),

diff --git a/dist/settings-vue-settings-personal-info.js b/dist/settings-vue-settings-personal-info.js
diff --git a/dist/settings-vue-settings-personal-info.js.map b/dist/settings-vue-settings-personal-info.js.map