Skip to content
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

Jump to bottom

Send Test Mail Feature #2023

Merged
merged 32 commits into from
May 31, 2020
Merged

Send Test Mail Feature #2023

Changes from 1 commit
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
8984554
First working version
askvortsov1 Feb 24, 2020
4483c0c
Added explanatory comment to TemporarySettingsRepository
askvortsov1 Feb 24, 2020
b3e3ae8
Added translation support
askvortsov1 Feb 24, 2020
edb081b
StyleCI Fixes
askvortsov1 Feb 24, 2020
7a13d76
Moved sending test email to API
askvortsov1 Feb 28, 2020
c6586b5
Renamed mail settings endpoint to /mail/settings for consistency
askvortsov1 Feb 28, 2020
ec6aed3
Use email of active user instead of arbitrary email when sending test…
askvortsov1 Feb 28, 2020
19fdf7e
Disable send test mail button while sending to prevent double sending.
askvortsov1 Feb 28, 2020
827e111
Typehint container instead of app.
askvortsov1 Feb 28, 2020
ff0c3a0
Removed unused import from admin routes
askvortsov1 Feb 28, 2020
e71f4c8
Use mithril props for disabling 'send test mail' button while waiting…
askvortsov1 Feb 29, 2020
f2d418c
Set send test mail controller to use saved settings instead of testin…
askvortsov1 Mar 6, 2020
d47732b
Prettify code
askvortsov1 Apr 21, 2020
7344e87
Changed mail settings to new URL
askvortsov1 Apr 21, 2020
166fa9d
Rearranged signature of construct method to follow alphabetical order
askvortsov1 Apr 21, 2020
3b7c64a
De-propify sendingTest on MailPage
askvortsov1 May 12, 2020
fb51415
Removed redundant type: button
askvortsov1 May 12, 2020
22ff44b
settings no longer necessary when sending test mail
askvortsov1 May 12, 2020
6911395
Remove redundant error handling code
askvortsov1 May 12, 2020
e5c21be
Roll back mail settings api endpoint route change, this should be in …
askvortsov1 May 15, 2020
f659234
Simplified JSX a little bit
askvortsov1 May 15, 2020
230a73e
Formatting updates
askvortsov1 May 15, 2020
7986925
One more formatting update
askvortsov1 May 15, 2020
3c97653
Revert "One more formatting update"
askvortsov1 May 23, 2020
dd8f401
Revert "Formatting updates"
askvortsov1 May 23, 2020
3a0a134
Revert "Simplified JSX a little bit"
askvortsov1 May 23, 2020
8a67471
Use JSX for that one FieldSet
askvortsov1 May 23, 2020
98c8ac6
Update conditionals
askvortsov1 May 23, 2020
543d628
Use /mail/settings route after all.
askvortsov1 May 23, 2020
95a3bcd
Revert unnecessary changes
askvortsov1 May 31, 2020
ac6e691
Dismiss alerts so they don't stack up
askvortsov1 May 31, 2020
c7bb324
More prettify
askvortsov1 May 31, 2020
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
Prev Previous commit
Next Next commit
Dismiss alerts so they don't stack up
  • Loading branch information
@askvortsov1
askvortsov1 committed May 31, 2020
commit ac6e691c60df97cefa981e169fb90c87af358dbe
6 changes: 2 additions & 4 deletions js/src/admin/components/MailPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@ export default class MailPage extends Page {
if (this.saving || this.sendingTest) return;

this.sendingTest = true;
app.alerts.dismiss(this.testEmailSuccessAlert);

app
.request({
Expand All @@ -179,10 +180,7 @@ export default class MailPage extends Page {
.then((response) => {
this.sendingTest = false;
app.alerts.show(
new Alert({
type: 'success',
children: app.translator.trans('core.admin.email.send_test_mail_success'),
})
(this.testEmailSuccessAlert = new Alert( {type: 'success', children: app.translator.trans('core.admin.email.send_test_mail_success') }))
);
})
.catch((error) => {
Expand Down