mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Keep Calendar server settings in groupware but link mail server settings 

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
This commit is contained in:
Jan-Christoph Borchardt 2019-01-24 16:15:24 +01:00 committed by Julius Härtl
parent 280dce8dbc
commit 3508c2368f
No known key found for this signature in database
GPG Key ID: 4C614C6ED2CDE6DF
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/dav/lib/Settings/CalDAVSettings.php
View File

@ -57,7 +57,7 @@ class CalDAVSettings implements ISettings {
* @return string * @return string
*/ */
public function getSection() { public function getSection() {
return 'server'; return 'groupware';
} }
/** /**

2
apps/dav/templates/settings-admin-caldav.php
View File

@ -37,7 +37,7 @@ script('dav', [
<?php ($_['send_invitations'] === 'yes') ? print_unescaped('checked="checked"') : null ?>/> <?php ($_['send_invitations'] === 'yes') ? print_unescaped('checked="checked"') : null ?>/>
<label for="caldavSendInvitations"><?php p($l->t('Send invitations to attendees')); ?></label> <label for="caldavSendInvitations"><?php p($l->t('Send invitations to attendees')); ?></label>
<br> <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>
<p> <p>
<input type="checkbox" name="caldav_generate_birthday_calendar" id="caldavGenerateBirthdayCalendar" class="checkbox" <input type="checkbox" name="caldav_generate_birthday_calendar" id="caldavGenerateBirthdayCalendar" class="checkbox"

2
apps/dav/tests/unit/Settings/CalDAVSettingsTest.php
View File

@ -49,7 +49,7 @@ class CalDAVSettingsTest extends TestCase {
} }
public function testGetSection() { public function testGetSection() {
$this->assertEquals('server', $this->settings->getSection()); $this->assertEquals('groupware', $this->settings->getSection());
} }
public function testGetPriority() { public function testGetPriority() {