Skip to content

Commit 40f3bc4

Browse files
committed
Rename setting 'sendEventRemindersToSharedGroupMembers' -> 'sendEventRemindersToSharedUsers'.
Signed-off-by: Daniel Teichmann <daniel.teichmann@das-netzwerkteam.de>
1 parent b6209d6 commit 40f3bc4

File tree

7 files changed

+18
-18
lines changed

7 files changed

+18
-18
lines changed

apps/dav/lib/CalDAV/Reminder/ReminderService.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ public function processReminders():void {
152152
continue;
153153
}
154154

155-
if ($this->config->getAppValue('dav', 'sendEventRemindersToSharedGroupMembers', 'yes') === 'no') {
155+
if ($this->config->getAppValue('dav', 'sendEventRemindersToSharedUsers', 'yes') === 'no') {
156156
$users = $this->getAllUsersWithWriteAccessToCalendar($reminder['calendar_id']);
157157
} else {
158158
$users = [];

apps/dav/lib/Settings/CalDAVSettings.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class CalDAVSettings implements IDelegatedSettings {
4646
'sendInvitations' => 'yes',
4747
'generateBirthdayCalendar' => 'yes',
4848
'sendEventReminders' => 'yes',
49-
'sendEventRemindersToSharedGroupMembers' => 'yes',
49+
'sendEventRemindersToSharedUsers' => 'yes',
5050
'sendEventRemindersPush' => 'no',
5151
];
5252

apps/dav/src/settings.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ const CalDavSettingsView = new View({
1616
'generateBirthdayCalendar'
1717
),
1818
sendEventReminders: loadState('dav', 'sendEventReminders'),
19-
sendEventRemindersToSharedGroupMembers: loadState(
19+
sendEventRemindersToSharedUsers: loadState(
2020
'dav',
21-
'sendEventRemindersToSharedGroupMembers'
21+
'sendEventRemindersToSharedUsers'
2222
),
2323
sendEventRemindersPush: loadState('dav', 'sendEventRemindersPush'),
2424
}

apps/dav/src/views/CalDavSettings.spec.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ describe('CalDavSettings', () => {
4545
sendInvitations: true,
4646
generateBirthdayCalendar: true,
4747
sendEventReminders: true,
48-
sendEventRemindersToSharedGroupMembers: true,
48+
sendEventRemindersToSharedUsers: true,
4949
sendEventRemindersPush: true,
5050
}
5151
},
@@ -67,10 +67,10 @@ describe('CalDavSettings', () => {
6767
'Send notifications for events'
6868
)
6969
expect(sendEventReminders).toBeChecked()
70-
const sendEventRemindersToSharedGroupMembers = TLUtils.getByLabelText(
70+
const sendEventRemindersToSharedUsers = TLUtils.getByLabelText(
7171
'Send reminder notifications to calendar sharees as well'
7272
)
73-
expect(sendEventRemindersToSharedGroupMembers).toBeChecked()
73+
expect(sendEventRemindersToSharedUsers).toBeChecked()
7474
const sendEventRemindersPush = TLUtils.getByLabelText(
7575
'Enable notifications for events via push'
7676
)
@@ -113,7 +113,7 @@ describe('CalDavSettings', () => {
113113
'no'
114114
)
115115

116-
expect(sendEventRemindersToSharedGroupMembers).toBeDisabled()
116+
expect(sendEventRemindersToSharedUsers).toBeDisabled()
117117
expect(sendEventRemindersPush).toBeDisabled()
118118

119119
OCP.AppConfig.setValue.mockClear()
@@ -125,7 +125,7 @@ describe('CalDavSettings', () => {
125125
'yes'
126126
)
127127

128-
expect(sendEventRemindersToSharedGroupMembers).toBeEnabled()
128+
expect(sendEventRemindersToSharedUsers).toBeEnabled()
129129
expect(sendEventRemindersPush).toBeEnabled()
130130
})
131131
})

apps/dav/src/views/CalDavSettings.vue

+5-5
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,12 @@
5858
</em>
5959
</p>
6060
<p class="indented">
61-
<input id="caldavSendEventRemindersToSharedGroupMembers"
62-
v-model="sendEventRemindersToSharedGroupMembers"
61+
<input id="caldavSendEventRemindersToSharedUsers"
62+
v-model="sendEventRemindersToSharedUsers"
6363
type="checkbox"
6464
class="checkbox"
6565
:disabled="!sendEventReminders">
66-
<label for="caldavSendEventRemindersToSharedGroupMembers">
66+
<label for="caldavSendEventRemindersToSharedUsers">
6767
{{ $t('dav', 'Send reminder notifications to calendar sharees as well' ) }}
6868
</label>
6969
<br>
@@ -138,10 +138,10 @@ export default {
138138
sendEventReminders(value) {
139139
OCP.AppConfig.setValue('dav', 'sendEventReminders', value ? 'yes' : 'no')
140140
},
141-
sendEventRemindersToSharedGroupMembers(value) {
141+
sendEventRemindersToSharedUsers(value) {
142142
OCP.AppConfig.setValue(
143143
'dav',
144-
'sendEventRemindersToSharedGroupMembers',
144+
'sendEventRemindersToSharedUsers',
145145
value ? 'yes' : 'no'
146146
)
147147
},

apps/dav/src/views/__snapshots__/CalDavSettings.spec.js.snap

+2-2
Original file line numberDiff line numberDiff line change
@@ -131,12 +131,12 @@ exports[`CalDavSettings interactions 1`] = `
131131
>
132132
<input
133133
class="checkbox"
134-
id="caldavSendEventRemindersToSharedGroupMembers"
134+
id="caldavSendEventRemindersToSharedUsers"
135135
type="checkbox"
136136
/>
137137
138138
<label
139-
for="caldavSendEventRemindersToSharedGroupMembers"
139+
for="caldavSendEventRemindersToSharedUsers"
140140
>
141141
142142
Send reminder notifications to calendar sharees as well

apps/dav/tests/unit/Settings/CalDAVSettingsTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public function testGetForm() {
6262
['dav', 'sendInvitations', 'yes'],
6363
['dav', 'generateBirthdayCalendar', 'yes'],
6464
['dav', 'sendEventReminders', 'yes'],
65-
['dav', 'sendEventRemindersToSharedGroupMembers', 'yes'],
65+
['dav', 'sendEventRemindersToSharedUsers', 'yes'],
6666
['dav', 'sendEventRemindersPush', 'no'],
6767
)
6868
->will($this->onConsecutiveCalls('yes', 'no', 'yes', 'yes', 'yes'));
@@ -77,7 +77,7 @@ public function testGetForm() {
7777
['sendInvitations', true],
7878
['generateBirthdayCalendar', false],
7979
['sendEventReminders', true],
80-
['sendEventRemindersToSharedGroupMembers', true],
80+
['sendEventRemindersToSharedUsers', true],
8181
['sendEventRemindersPush', true],
8282
);
8383
$result = $this->settings->getForm();

0 commit comments

Comments
 (0)