Merge branch 'ent-7087-Mensaje-duplicado-en-los-test-mails' into 'develop'

Ent 7087 mensaje duplicado en los test mails

See merge request artica/pandorafms!3973
This commit is contained in:
Daniel Rodriguez 2021-05-11 13:48:09 +00:00
commit e5a06ba29a
1 changed files with 11 additions and 3 deletions

View File

@ -641,8 +641,8 @@ echo '<legend>'.__('Mail configuration').'</legend>';
$table_mail_test->width = '100%'; $table_mail_test->width = '100%';
$table_mail_test->class = 'databox filters'; $table_mail_test->class = 'databox filters';
$table_mail_test->data = []; $table_mail_test->data = [];
$table_mail_test->style[0] = 'font-weight: bold'; $table_mail_test->style[0] = 'font-weight: bold;';
$table_mail_test->colspan[1][0] = 2; $table_mail_test->style[1] = 'font-weight: bold;display: flex;height: 54px;align-items: center;';
$table_mail_test->data[0][0] = __('Address'); $table_mail_test->data[0][0] = __('Address');
$table_mail_test->data[0][1] = html_print_input_text( $table_mail_test->data[0][1] = html_print_input_text(
@ -661,7 +661,9 @@ echo '<legend>'.__('Mail configuration').'</legend>';
'', '',
'class="sub next"', 'class="sub next"',
true true
).'&nbsp&nbsp<span id="email_test_sent_message" class="invisible">Email sent</span><span id="email_test_failure_message" class=invisible">Email could not be sent</span>'; );
$table_mail_test->data[1][1] = '&nbsp&nbsp<span id="email_test_sent_message" class="invisible"><b>Email sent</b></span><span id="email_test_failure_message" class=invisible"><b>Email could not be sent</b></span>';
echo '<div id="email_test_'.$id.'" title="'.__('Check mail configuration').'" class="invisible">'.html_print_table($table_mail_test, true).'</div>'; echo '<div id="email_test_'.$id.'" title="'.__('Check mail configuration').'" class="invisible">'.html_print_table($table_mail_test, true).'</div>';
} }
@ -703,6 +705,9 @@ function show_email_test(id) {
} }
function perform_email_test () { function perform_email_test () {
$('#email_test_sent_message').hide();
$('#email_test_failure_message').hide();
var test_address = $('#text-email_test_address').val(); var test_address = $('#text-email_test_address').val();
$.ajax({ $.ajax({
@ -713,12 +718,15 @@ function perform_email_test () {
success: function(data) { success: function(data) {
if (parseInt(data) === 1) { if (parseInt(data) === 1) {
$('#email_test_sent_message').show(); $('#email_test_sent_message').show();
$('#email_test_failure_message').hide();
} else { } else {
$('#email_test_failure_message').show(); $('#email_test_failure_message').show();
$('#email_test_sent_message').hide();
} }
}, },
error: function() { error: function() {
$('#email_test_failure_message').show(); $('#email_test_failure_message').show();
$('#email_test_sent_message').hide();
}, },
}); });
} }