Skip to content

Commit 2d9d6de

Browse files
provokateurinAndyScherzinger
authored andcommitted
fix(settings): Fix mail server settings form
Signed-off-by: provokateurin <[email protected]>
1 parent 823782b commit 2d9d6de

File tree

1 file changed

+20
-29
lines changed

1 file changed

+20
-29
lines changed

apps/settings/src/admin.js

Lines changed: 20 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22
* SPDX-FileCopyrightText: 2022 Nextcloud GmbH and Nextcloud contributors
33
* SPDX-License-Identifier: AGPL-3.0-or-later
44
*/
5+
6+
import { generateUrl } from '@nextcloud/router'
7+
import $ from 'jquery'
8+
import axios from '@nextcloud/axios'
9+
510
window.addEventListener('DOMContentLoaded', () => {
611
$('#loglevel').change(function() {
712
$.post(OC.generateUrl('/settings/admin/log/level'), { level: $(this).val() }, () => {
@@ -44,17 +49,12 @@ window.addEventListener('DOMContentLoaded', () => {
4449
}
4550

4651
OC.msg.startSaving('#mail_settings_msg')
47-
$.ajax({
48-
url: OC.generateUrl('/settings/admin/mailsettings'),
49-
type: 'POST',
50-
data: $('#mail_general_settings_form').serialize(),
51-
success: () => {
52+
axios.post(generateUrl('/settings/admin/mailsettings'), $('#mail_general_settings_form').serialize())
53+
.then(() => {
5254
OC.msg.finishedSuccess('#mail_settings_msg', t('settings', 'Saved'))
53-
},
54-
error: (xhr) => {
55-
OC.msg.finishedError('#mail_settings_msg', xhr.responseJSON)
56-
},
57-
})
55+
}).catch((error) => {
56+
OC.msg.finishedError('#mail_settings_msg', error)
57+
})
5858
}
5959

6060
const toggleEmailCredentials = function() {
@@ -64,17 +64,12 @@ window.addEventListener('DOMContentLoaded', () => {
6464
}
6565

6666
OC.msg.startSaving('#mail_settings_msg')
67-
$.ajax({
68-
url: OC.generateUrl('/settings/admin/mailsettings/credentials'),
69-
type: 'POST',
70-
data: $('#mail_credentials_settings').serialize(),
71-
success: () => {
67+
axios.post(generateUrl('/settings/admin/mailsettings/credentials'), $('#mail_credentials_settings').serialize())
68+
.then(() => {
7269
OC.msg.finishedSuccess('#mail_settings_msg', t('settings', 'Saved'))
73-
},
74-
error: (xhr) => {
75-
OC.msg.finishedError('#mail_settings_msg', xhr.responseJSON)
76-
},
77-
})
70+
}).catch((error) => {
71+
OC.msg.finishedError('#mail_settings_msg', error)
72+
})
7873
}
7974

8075
$('#mail_general_settings_form').change(changeEmailSettings)
@@ -90,16 +85,12 @@ window.addEventListener('DOMContentLoaded', () => {
9085
event.preventDefault()
9186
OC.msg.startAction('#sendtestmail_msg', t('settings', 'Sending…'))
9287

93-
$.ajax({
94-
url: OC.generateUrl('/settings/admin/mailtest'),
95-
type: 'POST',
96-
success: () => {
88+
axios.post(generateUrl('/settings/admin/mailtest'))
89+
.then(() => {
9790
OC.msg.finishedSuccess('#sendtestmail_msg', t('settings', 'Email sent'))
98-
},
99-
error: (xhr) => {
100-
OC.msg.finishedError('#sendtestmail_msg', xhr.responseJSON)
101-
},
102-
})
91+
}).catch((error) => {
92+
OC.msg.finishedError('#sendtestmail_msg', error)
93+
})
10394
})
10495

10596
const setupChecks = () => {

0 commit comments

Comments
 (0)