Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
J
jumpserver
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ops
jumpserver
Commits
334e3bef
Unverified
Commit
334e3bef
authored
Oct 21, 2019
by
BaiJiangJie
Committed by
GitHub
Oct 21, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #3363 from jumpserver/dev_ug
[Update] 优化用户组详情,用户选择下拉列表使用异步加载;命令过滤详情绑定到系统用户点击不关闭;
parents
1bc64920
0930716a
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
cmd_filter_detail.html
apps/assets/templates/assets/cmd_filter_detail.html
+3
-1
user_group_detail.html
apps/users/templates/users/user_group_detail.html
+2
-4
No files found.
apps/assets/templates/assets/cmd_filter_detail.html
View file @
334e3bef
...
...
@@ -144,7 +144,9 @@ function updateCMDFilterSystemUsers(system_users) {
});
}
$
(
document
).
ready
(
function
()
{
$
(
".select2"
).
select2
();
$
(
".select2"
).
select2
({
closeOnSelect
:
false
});
}).
on
(
'click'
,
'#btn-binding-system-users'
,
function
()
{
var
origin_system_users
=
$
.
map
(
$
(
".bdg-system-users"
),
function
(
s
)
{
return
$
(
s
).
data
(
'gid'
)
...
...
apps/users/templates/users/user_group_detail.html
View file @
334e3bef
...
...
@@ -84,9 +84,6 @@
<tr>
<td
colspan=
"2"
class=
"no-borders"
>
<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>
</td>
</tr>
...
...
@@ -157,7 +154,8 @@ $(document).ready(function () {
}).
on
(
'select2:unselect'
,
function
(
evt
)
{
var
data
=
evt
.
params
.
data
;
delete
jumpserver
.
users_selected
[
data
.
id
]
})
});
usersSelect2Init
(
'#slct_users'
)
}).
on
(
'click'
,
'.btn_remove_user'
,
function
()
{
var
$this
=
$
(
this
);
var
$tr
=
$this
.
closest
(
'tr'
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment