github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #3363 from jumpserver/dev_ug 

[Update] 优化用户组详情，用户选择下拉列表使用异步加载；命令过滤详情绑定到系统用户点击不关闭；
pull/3368/head
BaiJiangJie 2019-10-21 18:46:43 +08:00 committed by GitHub
parent 1bc6492064 0930716a54
commit 334e3bef0e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/assets/templates/assets/cmd_filter_detail.html
View File

@ -144,7 +144,9 @@ function updateCMDFilterSystemUsers(system_users) {
}); });
} }
$(document).ready(function () { $(document).ready(function () {
$(".select2").select2(); $(".select2").select2({
closeOnSelect: false
});
}).on('click', '#btn-binding-system-users', function () { }).on('click', '#btn-binding-system-users', function () {
var origin_system_users = $.map($(".bdg-system-users"), function (s) { var origin_system_users = $.map($(".bdg-system-users"), function (s) {
return $(s).data('gid') return $(s).data('gid')

6
apps/users/templates/users/user_group_detail.html
View File

@ -84,9 +84,6 @@
<tr> <tr>
<td colspan="2" class="no-borders"> <td colspan="2" class="no-borders">
<select data-placeholder="{% trans 'Add user' %}" id="slct_users" class="select2" style="width: 100%" multiple="" tabindex="4"> <select data-placeholder="{% trans 'Add user' %}" id="slct_users" class="select2" style="width: 100%" multiple="" tabindex="4">
{% for user in users %}
<option value="{{ user.id }}" id="opt_{{ user.id }}">{{ user.name }}</option>
{% endfor %}
</select> </select>
</td> </td>
</tr> </tr>
@ -157,7 +154,8 @@ $(document).ready(function () {
}).on('select2:unselect', function(evt) { }).on('select2:unselect', function(evt) {
var data = evt.params.data; var data = evt.params.data;
delete jumpserver.users_selected[data.id] delete jumpserver.users_selected[data.id]
}) });
usersSelect2Init('#slct_users')
}).on('click', '.btn_remove_user', function() { }).on('click', '.btn_remove_user', function() {
var $this = $(this); var $this = $(this);
var $tr = $this.closest('tr'); var $tr = $this.closest('tr');