Rename setting 'sendEventRemindersToSharedGroupMembers' -> 'sendEvent…

…RemindersToSharedUsers'. Signed-off-by: Daniel Teichmann <daniel.teichmann@das-netzwerkteam.de>
nextcloud · Mar 23, 2022 · cc8efc8 · cc8efc8
1 parent 0fa17f8
commit cc8efc8
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 18 deletions.
diff --git a/apps/dav/lib/CalDAV/Reminder/ReminderService.php b/apps/dav/lib/CalDAV/Reminder/ReminderService.php
@@ -152,7 +152,7 @@ public function processReminders():void {
 				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
@@ -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
@@ -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
@@ -45,7 +45,7 @@ describe('CalDavSettings', () => {
 						sendInvitations: true,
 						generateBirthdayCalendar: true,
 						sendEventReminders: true,
-						sendEventRemindersToSharedGroupMembers: true,
+						sendEventRemindersToSharedUsers: true,
 						sendEventRemindersPush: true,
 					}
 				},
@@ -67,10 +67,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'
 		)
@@ -113,7 +113,7 @@ describe('CalDavSettings', () => {
 			'no'
 		)
 
-		expect(sendEventRemindersToSharedGroupMembers).toBeDisabled()
+		expect(sendEventRemindersToSharedUsers).toBeDisabled()
 		expect(sendEventRemindersPush).toBeDisabled()
 
 		OCP.AppConfig.setValue.mockClear()
@@ -125,7 +125,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
@@ -58,12 +58,12 @@
 			</em>
 		</p>
 		<p class="indented">
-			<input id="caldavSendEventRemindersToSharedGroupMembers"
-				v-model="sendEventRemindersToSharedGroupMembers"
+			<input id="caldavSendEventRemindersToSharedUsers"
+				v-model="sendEventRemindersToSharedUsers"
 				type="checkbox"
 				class="checkbox"
 				:disabled="!sendEventReminders">
-			<label for="caldavSendEventRemindersToSharedGroupMembers">
+			<label for="caldavSendEventRemindersToSharedUsers">
 				{{ $t('dav', 'Send reminder notifications to calendar sharees as well' ) }}
 			</label>
 			<br>
@@ -138,10 +138,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/src/views/__snapshots__/CalDavSettings.spec.js.snap b/apps/dav/src/views/__snapshots__/CalDavSettings.spec.js.snap
@@ -131,12 +131,12 @@ exports[`CalDavSettings interactions 1`] = `
     >
       <input
         class="checkbox"
-        id="caldavSendEventRemindersToSharedGroupMembers"
+        id="caldavSendEventRemindersToSharedUsers"
         type="checkbox"
       />
        
       <label
-        for="caldavSendEventRemindersToSharedGroupMembers"
+        for="caldavSendEventRemindersToSharedUsers"
       >
         
 			Send reminder notifications to calendar sharees as well

diff --git a/apps/dav/tests/unit/Settings/CalDAVSettingsTest.php b/apps/dav/tests/unit/Settings/CalDAVSettingsTest.php
@@ -62,7 +62,7 @@ public function testGetForm() {
 			   ['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'));
@@ -77,7 +77,7 @@ public function testGetForm() {
 				['sendInvitations', true],
 				['generateBirthdayCalendar', false],
 				['sendEventReminders', true],
-				['sendEventRemindersToSharedGroupMembers', true],
+				['sendEventRemindersToSharedUsers', true],
 				['sendEventRemindersPush', true],
 			);
 		$result = $this->settings->getForm();