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
0809916b
Commit
0809916b
authored
Jul 06, 2019
by
ibuler
Browse files
Options
Browse Files
Download
Plain Diff
[Update] Merge with master
parents
cc56c925
9ca4a8c9
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
1 deletion
+4
-1
__init__.py
apps/assets/models/__init__.py
+1
-0
admin_user_assets.html
apps/assets/templates/assets/admin_user_assets.html
+1
-1
jumpserver.js
apps/static/js/jumpserver.js
+2
-0
No files found.
apps/assets/models/__init__.py
View file @
0809916b
...
@@ -8,3 +8,4 @@ from .node import *
...
@@ -8,3 +8,4 @@ from .node import *
from
.cmd_filter
import
*
from
.cmd_filter
import
*
from
.authbook
import
*
from
.authbook
import
*
from
.utils
import
*
from
.utils
import
*
from
.authbook
import
*
apps/assets/templates/assets/admin_user_assets.html
View file @
0809916b
...
@@ -23,7 +23,7 @@
...
@@ -23,7 +23,7 @@
</ul>
</ul>
</div>
</div>
<div
class=
"tab-content"
>
<div
class=
"tab-content"
>
<div
class=
"col-sm-
8
"
style=
"padding-left: 0;"
>
<div
class=
"col-sm-
9
"
style=
"padding-left: 0;"
>
<div
class=
"ibox float-e-margins"
>
<div
class=
"ibox float-e-margins"
>
<div
class=
"ibox-title"
>
<div
class=
"ibox-title"
>
<span
style=
"float: left"
>
{% trans 'Asset list of ' %}
<b>
{{ admin_user.name }}
</b></span>
<span
style=
"float: left"
>
{% trans 'Asset list of ' %}
<b>
{{ admin_user.name }}
</b></span>
...
...
apps/static/js/jumpserver.js
View file @
0809916b
...
@@ -654,6 +654,8 @@ jumpserver.initServerSideDataTable = function (options) {
...
@@ -654,6 +654,8 @@ jumpserver.initServerSideDataTable = function (options) {
$
.
each
(
rows
,
function
(
id
,
row
)
{
$
.
each
(
rows
,
function
(
id
,
row
)
{
table
.
selected_rows
.
push
(
row
);
table
.
selected_rows
.
push
(
row
);
if
(
row
.
id
&&
$
.
inArray
(
row
.
id
,
table
.
selected
)
===
-
1
){
if
(
row
.
id
&&
$
.
inArray
(
row
.
id
,
table
.
selected
)
===
-
1
){
console
.
log
(
table
)
console
.
log
(
table
.
selected
);
table
.
selected
.
push
(
row
.
id
)
table
.
selected
.
push
(
row
.
id
)
}
}
})
})
...
...
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