[Update] 优化LDAP用户导入功能,可导入跨页选取的所有用户 (#2745)

This commit is contained in:
BaiJiangJie
2019-05-29 10:11:58 +08:00
committed by 老广
parent dc4bf669b0
commit 00e986a64e
4 changed files with 46 additions and 12 deletions

View File

@@ -52,7 +52,7 @@
var ldap_users_table = 0;
function initLdapUsersTable() {
if(ldap_users_table){
return
return ldap_users_table
}
var options = {
ele: $('#ldap_list_users_table'),
@@ -73,10 +73,10 @@ function initLdapUsersTable() {
{data: "username" },{data: "username" }, {data: "name" },
{data:"email"}, {data:'existing'}
],
pageLength: 10
pageLength: 15
};
ldap_users_table = jumpserver.initDataTable(options);
ldap_users_table = jumpserver.initServerSideDataTable(options);
return ldap_users_table
}

View File

@@ -110,10 +110,7 @@ $(document).ready(function () {
});
})
.on("click","#btn_ldap_modal_confirm",function () {
var username_list=[];
$("tbody input[type='checkbox']:checked").each(function () {
username_list.push($(this).attr('id'));
});
var username_list = ldap_users_table.selected;
if (username_list.length === 0){
var msg = "{% trans 'User is not currently selected, please check the user you want to import'%}";