Merge pull request #31660 from dzatoah/pr/rename-sendEventRemindersToSharedGroupMembers-to-sendEventRemindersToSharedUsers

Rename setting 'sendEventRemindersToSharedGroupMembers' -> 'sendEventRemindersToSharedUsers'.

6 files changed, 14 insertions, 14 deletions

diff --git a/apps/dav/lib/CalDAV/Reminder/ReminderService.php b/apps/dav/lib/CalDAV/Reminder/ReminderService.php
index bca154a48e8..984e29f1e4d 100644
--- a/apps/dav/lib/CalDAV/Reminder/ReminderService.php
+++ b/apps/dav/lib/CalDAV/Reminder/ReminderService.php
@@ -179,7 +179,7 @@ class ReminderService {
 				continue;
 			}
 
-			if ($this->config->getAppValue('dav', 'sendEventRemindersToSharedGroupMembers', 'yes') === 'no') {
+			if ($this->config->getAppValue('dav', 'sendEventRemindersToSharedUsers', 'yes') === 'no') {
 				$users = $this->getAllUsersWithWriteAccessToCalendar($reminder['calendar_id']);
 			} else {
 				$users = [];
diff --git a/apps/dav/lib/Settings/CalDAVSettings.php b/apps/dav/lib/Settings/CalDAVSettings.php
index 6d60b2611e0..b3825a6a37c 100644
--- a/apps/dav/lib/Settings/CalDAVSettings.php
+++ b/apps/dav/lib/Settings/CalDAVSettings.php
@@ -46,7 +46,7 @@ class CalDAVSettings implements IDelegatedSettings {
 		'sendInvitations' => 'yes',
 		'generateBirthdayCalendar' => 'yes',
 		'sendEventReminders' => 'yes',
-		'sendEventRemindersToSharedGroupMembers' => 'yes',
+		'sendEventRemindersToSharedUsers' => 'yes',
 		'sendEventRemindersPush' => 'no',
 	];
 
diff --git a/apps/dav/src/settings.js b/apps/dav/src/settings.js
index a99db386d69..56b9c7f3fb9 100644
--- a/apps/dav/src/settings.js
+++ b/apps/dav/src/settings.js
@@ -16,9 +16,9 @@ const CalDavSettingsView = new View({
 				'generateBirthdayCalendar'
 			),
 			sendEventReminders: loadState('dav', 'sendEventReminders'),
-			sendEventRemindersToSharedGroupMembers: loadState(
+			sendEventRemindersToSharedUsers: loadState(
 				'dav',
-				'sendEventRemindersToSharedGroupMembers'
+				'sendEventRemindersToSharedUsers'
 			),
 			sendEventRemindersPush: loadState('dav', 'sendEventRemindersPush'),
 		}
diff --git a/apps/dav/src/views/CalDavSettings.spec.js b/apps/dav/src/views/CalDavSettings.spec.js
index 7bc6e2f7b40..311c8923dc3 100644
--- a/apps/dav/src/views/CalDavSettings.spec.js
+++ b/apps/dav/src/views/CalDavSettings.spec.js
@@ -43,7 +43,7 @@ describe('CalDavSettings', () => {
 						sendInvitations: true,
 						generateBirthdayCalendar: true,
 						sendEventReminders: true,
-						sendEventRemindersToSharedGroupMembers: true,
+						sendEventRemindersToSharedUsers: true,
 						sendEventRemindersPush: true,
 					}
 				},
@@ -65,10 +65,10 @@ describe('CalDavSettings', () => {
 			'Send notifications for events'
 		)
 		expect(sendEventReminders).toBeChecked()
-		const sendEventRemindersToSharedGroupMembers = TLUtils.getByLabelText(
+		const sendEventRemindersToSharedUsers = TLUtils.getByLabelText(
 			'Send reminder notifications to calendar sharees as well'
 		)
-		expect(sendEventRemindersToSharedGroupMembers).toBeChecked()
+		expect(sendEventRemindersToSharedUsers).toBeChecked()
 		const sendEventRemindersPush = TLUtils.getByLabelText(
 			'Enable notifications for events via push'
 		)
@@ -114,7 +114,7 @@ describe('CalDavSettings', () => {
 			'no'
 		)
 
-		expect(sendEventRemindersToSharedGroupMembers).toBeDisabled()
+		expect(sendEventRemindersToSharedUsers).toBeDisabled()
 		expect(sendEventRemindersPush).toBeDisabled()
 
 		OCP.AppConfig.setValue.mockClear()
@@ -126,7 +126,7 @@ describe('CalDavSettings', () => {
 			'yes'
 		)
 
-		expect(sendEventRemindersToSharedGroupMembers).toBeEnabled()
+		expect(sendEventRemindersToSharedUsers).toBeEnabled()
 		expect(sendEventRemindersPush).toBeEnabled()
 		*/
 	})
diff --git a/apps/dav/src/views/CalDavSettings.vue b/apps/dav/src/views/CalDavSettings.vue
index 6755cbd171d..ff870f4b2d4 100644
--- a/apps/dav/src/views/CalDavSettings.vue
+++ b/apps/dav/src/views/CalDavSettings.vue
@@ -51,7 +51,7 @@
 		</p>
 		<p class="indented">
 			<NcCheckboxRadioSwitch id="caldavSendEventRemindersToSharedGroupMembers"
-				:checked.sync="sendEventRemindersToSharedGroupMembers"
+				:checked.sync="sendEventRemindersToSharedUsers"
 				type="switch"
 				:disabled="!sendEventReminders">
 				{{ $t('dav', 'Send reminder notifications to calendar sharees as well' ) }}
@@ -130,10 +130,10 @@ export default {
 		sendEventReminders(value) {
 			OCP.AppConfig.setValue('dav', 'sendEventReminders', value ? 'yes' : 'no')
 		},
-		sendEventRemindersToSharedGroupMembers(value) {
+		sendEventRemindersToSharedUsers(value) {
 			OCP.AppConfig.setValue(
 				'dav',
-				'sendEventRemindersToSharedGroupMembers',
+				'sendEventRemindersToSharedUsers',
 				value ? 'yes' : 'no'
 			)
 		},
diff --git a/apps/dav/tests/unit/Settings/CalDAVSettingsTest.php b/apps/dav/tests/unit/Settings/CalDAVSettingsTest.php
index 6bf1707c437..7d285a830d9 100644
--- a/apps/dav/tests/unit/Settings/CalDAVSettingsTest.php
+++ b/apps/dav/tests/unit/Settings/CalDAVSettingsTest.php
@@ -61,7 +61,7 @@ class CalDAVSettingsTest extends TestCase {
 			   ['dav', 'sendInvitations', 'yes'],
 			   ['dav', 'generateBirthdayCalendar', 'yes'],
 			   ['dav', 'sendEventReminders', 'yes'],
-			   ['dav', 'sendEventRemindersToSharedGroupMembers', 'yes'],
+			   ['dav', 'sendEventRemindersToSharedUsers', 'yes'],
 			   ['dav', 'sendEventRemindersPush', 'no'],
 		   )
 		   ->will($this->onConsecutiveCalls('yes', 'no', 'yes', 'yes', 'yes'));
@@ -76,7 +76,7 @@ class CalDAVSettingsTest extends TestCase {
 				['sendInvitations', true],
 				['generateBirthdayCalendar', false],
 				['sendEventReminders', true],
-				['sendEventRemindersToSharedGroupMembers', true],
+				['sendEventRemindersToSharedUsers', true],
 				['sendEventRemindersPush', true],
 			);
 		$result = $this->settings->getForm();