mirror of
https://github.com/nextcloud/server.git
synced 2026-05-28 04:32:30 -04:00
Rename setting 'sendEventRemindersToSharedGroupMembers' to 'sendEventRemindersToSharedUsers'.
Signed-off-by: Daniel Teichmann <daniel.teichmann@das-netzwerkteam.de>
This commit is contained in:
parent
527de8ac9d
commit
56f36b94e5
8 changed files with 17 additions and 17 deletions
|
|
@ -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 = [];
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ class CalDAVSettings implements IDelegatedSettings {
|
|||
'sendInvitations' => 'yes',
|
||||
'generateBirthdayCalendar' => 'yes',
|
||||
'sendEventReminders' => 'yes',
|
||||
'sendEventRemindersToSharedGroupMembers' => 'yes',
|
||||
'sendEventRemindersToSharedUsers' => 'yes',
|
||||
'sendEventRemindersPush' => 'no',
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -16,9 +16,9 @@ const CalDavSettingsView = new View({
|
|||
'generateBirthdayCalendar'
|
||||
),
|
||||
sendEventReminders: loadState('dav', 'sendEventReminders'),
|
||||
sendEventRemindersToSharedGroupMembers: loadState(
|
||||
sendEventRemindersToSharedUsers: loadState(
|
||||
'dav',
|
||||
'sendEventRemindersToSharedGroupMembers'
|
||||
'sendEventRemindersToSharedUsers'
|
||||
),
|
||||
sendEventRemindersPush: loadState('dav', 'sendEventRemindersPush'),
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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()
|
||||
*/
|
||||
})
|
||||
|
|
|
|||
|
|
@ -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'
|
||||
)
|
||||
},
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
|
|
|
|||
4
dist/dav-settings-admin-caldav.js
vendored
4
dist/dav-settings-admin-caldav.js
vendored
File diff suppressed because one or more lines are too long
2
dist/dav-settings-admin-caldav.js.map
vendored
2
dist/dav-settings-admin-caldav.js.map
vendored
File diff suppressed because one or more lines are too long
Loading…
Reference in a new issue