diff options
| author | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2019-01-24 16:15:24 +0100 |
|---|---|---|
| committer | Julius Härtl <jus@bitgrid.net> | 2019-02-01 10:06:31 +0100 |
| commit | 3508c2368f9e944dbfd4a70889351bdb4fb182a1 (patch) | |
| tree | 6acab0e6b7d66a19909a4b87b618b2b80968b655 /apps | |
| parent | 280dce8dbcb5b09e4bd69696aa63027f95a8d1e5 (diff) | |
| download | nextcloud-server-3508c2368f9e944dbfd4a70889351bdb4fb182a1.tar.gz nextcloud-server-3508c2368f9e944dbfd4a70889351bdb4fb182a1.zip | |
Keep Calendar server settings in groupware but link mail server settings
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/dav/lib/Settings/CalDAVSettings.php | 2 | ||||
| -rw-r--r-- | apps/dav/templates/settings-admin-caldav.php | 2 | ||||
| -rw-r--r-- | apps/dav/tests/unit/Settings/CalDAVSettingsTest.php | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/apps/dav/lib/Settings/CalDAVSettings.php b/apps/dav/lib/Settings/CalDAVSettings.php index 36ee07d9447..f38143b5b4e 100644 --- a/apps/dav/lib/Settings/CalDAVSettings.php +++ b/apps/dav/lib/Settings/CalDAVSettings.php @@ -57,7 +57,7 @@ class CalDAVSettings implements ISettings { * @return string */ public function getSection() { - return 'server'; + return 'groupware'; } /** diff --git a/apps/dav/templates/settings-admin-caldav.php b/apps/dav/templates/settings-admin-caldav.php index 0ed53f31bca..a30d4acccf7 100644 --- a/apps/dav/templates/settings-admin-caldav.php +++ b/apps/dav/templates/settings-admin-caldav.php @@ -37,7 +37,7 @@ script('dav', [ <?php ($_['send_invitations'] === 'yes') ? print_unescaped('checked="checked"') : null ?>/> <label for="caldavSendInvitations"><?php p($l->t('Send invitations to attendees')); ?></label> <br> - <em><?php p($l->t('Please make sure to properly set up the email settings above.')); ?></em> + <em><?php p($l->t('Please make sure to properly set up the email server.')); ?> <a href="../admin#mail_general_settings">↗</a></em> </p> <p> <input type="checkbox" name="caldav_generate_birthday_calendar" id="caldavGenerateBirthdayCalendar" class="checkbox" diff --git a/apps/dav/tests/unit/Settings/CalDAVSettingsTest.php b/apps/dav/tests/unit/Settings/CalDAVSettingsTest.php index 43d60038a23..a9df63a03ab 100644 --- a/apps/dav/tests/unit/Settings/CalDAVSettingsTest.php +++ b/apps/dav/tests/unit/Settings/CalDAVSettingsTest.php @@ -49,7 +49,7 @@ class CalDAVSettingsTest extends TestCase { } public function testGetSection() { - $this->assertEquals('server', $this->settings->getSection()); + $this->assertEquals('groupware', $this->settings->getSection()); } public function testGetPriority() { |