Skip to content

Commit e0accb5

Browse files
provokateurinAndyScherzinger
authored andcommitted
fix(settings): Fix mail server settings form
Signed-off-by: provokateurin <kate@provokateurin.de>
1 parent cfd31b4 commit e0accb5

File tree

1 file changed

+19
-29
lines changed

1 file changed

+19
-29
lines changed

apps/settings/src/admin.js

+19-29
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
import { generateUrl } from '@nextcloud/router'
2+
import $ from 'jquery'
3+
import axios from '@nextcloud/axios'
4+
15
window.addEventListener('DOMContentLoaded', () => {
26
$('#loglevel').change(function() {
37
$.post(OC.generateUrl('/settings/admin/log/level'), { level: $(this).val() }, () => {
@@ -40,17 +44,12 @@ window.addEventListener('DOMContentLoaded', () => {
4044
}
4145

4246
OC.msg.startSaving('#mail_settings_msg')
43-
$.ajax({
44-
url: OC.generateUrl('/settings/admin/mailsettings'),
45-
type: 'POST',
46-
data: $('#mail_general_settings_form').serialize(),
47-
success: () => {
47+
axios.post(generateUrl('/settings/admin/mailsettings'), $('#mail_general_settings_form').serialize())
48+
.then(() => {
4849
OC.msg.finishedSuccess('#mail_settings_msg', t('settings', 'Saved'))
49-
},
50-
error: (xhr) => {
51-
OC.msg.finishedError('#mail_settings_msg', xhr.responseJSON)
52-
},
53-
})
50+
}).catch((error) => {
51+
OC.msg.finishedError('#mail_settings_msg', error)
52+
})
5453
}
5554

5655
const toggleEmailCredentials = function() {
@@ -60,17 +59,12 @@ window.addEventListener('DOMContentLoaded', () => {
6059
}
6160

6261
OC.msg.startSaving('#mail_settings_msg')
63-
$.ajax({
64-
url: OC.generateUrl('/settings/admin/mailsettings/credentials'),
65-
type: 'POST',
66-
data: $('#mail_credentials_settings').serialize(),
67-
success: () => {
62+
axios.post(generateUrl('/settings/admin/mailsettings/credentials'), $('#mail_credentials_settings').serialize())
63+
.then(() => {
6864
OC.msg.finishedSuccess('#mail_settings_msg', t('settings', 'Saved'))
69-
},
70-
error: (xhr) => {
71-
OC.msg.finishedError('#mail_settings_msg', xhr.responseJSON)
72-
},
73-
})
65+
}).catch((error) => {
66+
OC.msg.finishedError('#mail_settings_msg', error)
67+
})
7468
}
7569

7670
$('#mail_general_settings_form').change(changeEmailSettings)
@@ -86,16 +80,12 @@ window.addEventListener('DOMContentLoaded', () => {
8680
event.preventDefault()
8781
OC.msg.startAction('#sendtestmail_msg', t('settings', 'Sending…'))
8882

89-
$.ajax({
90-
url: OC.generateUrl('/settings/admin/mailtest'),
91-
type: 'POST',
92-
success: () => {
83+
axios.post(generateUrl('/settings/admin/mailtest'))
84+
.then(() => {
9385
OC.msg.finishedSuccess('#sendtestmail_msg', t('settings', 'Email sent'))
94-
},
95-
error: (xhr) => {
96-
OC.msg.finishedError('#sendtestmail_msg', xhr.responseJSON)
97-
},
98-
})
86+
}).catch((error) => {
87+
OC.msg.finishedError('#sendtestmail_msg', error)
88+
})
9989
})
10090

10191
const setupChecks = () => {

0 commit comments

Comments
 (0)