Skip to content

[stable29] fix(settings): Fix mail server settings form #50183

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
provokateurin merged 2 commits into from
Jan 26, 2025
Merged

[stable29] fix(settings): Fix mail server settings form #50183

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e0accb5
fix(settings): Fix mail server settings form
provokateurin Jan 6, 2025
8ae4651
chore(assets): Recompile assets
nextcloud-command Jan 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
fix(settings): Fix mail server settings form 
Signed-off-by: provokateurin <[email protected]>
  • Loading branch information
@provokateurin @AndyScherzinger
provokateurin authored and AndyScherzinger committed Jan 26, 2025
commit e0accb5d5162e3e62c751d0f022fef41ff5a12c9
48 changes: 19 additions & 29 deletions apps/settings/src/admin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
import { generateUrl } from '@nextcloud/router'
import $ from 'jquery'
import axios from '@nextcloud/axios'

window.addEventListener('DOMContentLoaded', () => {
$('#loglevel').change(function() {
$.post(OC.generateUrl('/settings/admin/log/level'), { level: $(this).val() }, () => {
Expand Down Expand Up @@ -40,17 +44,12 @@ window.addEventListener('DOMContentLoaded', () => {
}

OC.msg.startSaving('#mail_settings_msg')
$.ajax({
url: OC.generateUrl('/settings/admin/mailsettings'),
type: 'POST',
data: $('#mail_general_settings_form').serialize(),
success: () => {
axios.post(generateUrl('/settings/admin/mailsettings'), $('#mail_general_settings_form').serialize())
.then(() => {
OC.msg.finishedSuccess('#mail_settings_msg', t('settings', 'Saved'))
},
error: (xhr) => {
OC.msg.finishedError('#mail_settings_msg', xhr.responseJSON)
},
})
}).catch((error) => {
OC.msg.finishedError('#mail_settings_msg', error)
})
}

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

OC.msg.startSaving('#mail_settings_msg')
$.ajax({
url: OC.generateUrl('/settings/admin/mailsettings/credentials'),
type: 'POST',
data: $('#mail_credentials_settings').serialize(),
success: () => {
axios.post(generateUrl('/settings/admin/mailsettings/credentials'), $('#mail_credentials_settings').serialize())
.then(() => {
OC.msg.finishedSuccess('#mail_settings_msg', t('settings', 'Saved'))
},
error: (xhr) => {
OC.msg.finishedError('#mail_settings_msg', xhr.responseJSON)
},
})
}).catch((error) => {
OC.msg.finishedError('#mail_settings_msg', error)
})
}

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

$.ajax({
url: OC.generateUrl('/settings/admin/mailtest'),
type: 'POST',
success: () => {
axios.post(generateUrl('/settings/admin/mailtest'))
.then(() => {
OC.msg.finishedSuccess('#sendtestmail_msg', t('settings', 'Email sent'))
},
error: (xhr) => {
OC.msg.finishedError('#sendtestmail_msg', xhr.responseJSON)
},
})
}).catch((error) => {
OC.msg.finishedError('#sendtestmail_msg', error)
})
})

const setupChecks = () => {
Expand Down
Loading