mirror of
https://github.com/snipe/snipe-it.git
synced 2024-11-10 07:34:06 -08:00
Merge pull request #14058 from Godmartinz/ldap_test_table_fix
Fixed Ldap sync test table and table data from overflowing
This commit is contained in:
commit
5f8e63717d
|
@ -701,7 +701,7 @@
|
||||||
html += '<li class="text-success"><i class="fas fa-check" aria-hidden="true"></i> ' + results.bind.message + ' </li>'
|
html += '<li class="text-success"><i class="fas fa-check" aria-hidden="true"></i> ' + results.bind.message + ' </li>'
|
||||||
html += '</ul>'
|
html += '</ul>'
|
||||||
html += '<div>{{ trans('admin/settings/message.ldap.sync_success') }}</div>'
|
html += '<div>{{ trans('admin/settings/message.ldap.sync_success') }}</div>'
|
||||||
html += '<table class="table table-bordered table-condensed" style="background-color: #fff">'
|
html += '<table class="table table-bordered table-condensed" style=" table-layout:fixed; width:100%; background-color: #fff">'
|
||||||
html += buildLdapResultsTableHeader()
|
html += buildLdapResultsTableHeader()
|
||||||
html += buildLdapResultsTableBody(results.user_sync.users)
|
html += buildLdapResultsTableBody(results.user_sync.users)
|
||||||
html += '<table>'
|
html += '<table>'
|
||||||
|
@ -729,7 +729,7 @@
|
||||||
{
|
{
|
||||||
let body = '<tbody>'
|
let body = '<tbody>'
|
||||||
for (var i in users) {
|
for (var i in users) {
|
||||||
body += '<tr><td>' + users[i].employee_number + '</td><td>' + users[i].username + '</td><td>' + users[i].firstname + '</td><td>' + users[i].lastname + '</td><td>' + users[i].email + '</td></tr>'
|
body += '<tr><td style="overflow:hidden;">' + users[i].employee_number + '</td><td style="overflow:hidden;">' + users[i].username + '</td><td style="overflow:hidden;">' + users[i].firstname + '</td><td style="overflow:hidden;">' + users[i].lastname + '</td><td style="overflow:hidden;">' + users[i].email + '</td></tr>'
|
||||||
}
|
}
|
||||||
body += "</tbody>"
|
body += "</tbody>"
|
||||||
return body;
|
return body;
|
||||||
|
|
Loading…
Reference in a new issue