DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse source
This commit is contained in:
snipe 2017-10-19 08:36:05 -07:00
parent 55500f77fb 7153013fb0
commit e5719441bc
2 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
app/Http/Controllers/Api/SettingsController.php
View file

@ -170,16 +170,19 @@ class SettingsController extends Controller
*/ */
public function ajaxTestEmail() public function ajaxTestEmail()
{ {
try { if (!config('app.lock_passwords')) {
Mail::send('emails.test', [], function ($m) { try {
$m->to(config('mail.from.address'), config('mail.from.name')); Mail::send('emails.test', [], function ($m) {
$m->replyTo(config('mail.reply_to.address'), config('mail.reply_to.name')); $m->to(config('mail.from.address'), config('mail.from.name'));
$m->subject(trans('mail.test_email')); $m->replyTo(config('mail.reply_to.address'), config('mail.reply_to.name'));
}); $m->subject(trans('mail.test_email'));
return response()->json(['message' => 'Mail sent! '], 200); });
} catch (Exception $e) { return response()->json(['message' => 'Mail sent to '.config('mail.from.address')], 200);
return response()->json(['message' => $e->getMessage()], 500); } catch (Exception $e) {
return response()->json(['message' => $e->getMessage()], 500);
}
} }
return response()->json(['message' => 'Mail would have been sent, but this application is in demo mode! '], 200);
} }

7
resources/views/settings/general.blade.php
View file

@ -250,12 +250,17 @@
dataType: 'json', dataType: 'json',
success: function (data) { success: function (data) {
console.dir(data);
$("#mailtesticon").html(''); $("#mailtesticon").html('');
$("#mailteststatus").html(''); $("#mailteststatus").html('');
$('#mailteststatus-error').html(''); $('#mailteststatus-error').html('');
$("#mailteststatus").removeClass('text-danger'); $("#mailteststatus").removeClass('text-danger');
$("#mailteststatus").addClass('text-success'); $("#mailteststatus").addClass('text-success');
$("#mailteststatus").html('<i class="fa fa-check text-success"></i> Mail sent!'); if (data.message) {
$("#mailteststatus").html('<i class="fa fa-check text-success"></i> ' + data.message);
} else {
$("#mailteststatus").html('<i class="fa fa-check text-success"></i> Mail sent!');
}
}, },
error: function (data) { error: function (data) {