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
2d07eeb1
Commit
2d07eeb1
authored
Jul 04, 2019
by
ibuler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Update] 修改去掉一些print
parent
1448d23c
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
5 additions
and
6 deletions
+5
-6
admin_user.py
apps/assets/views/admin_user.py
+0
-2
serializers.py
apps/common/mixins/serializers.py
+0
-2
models.py
apps/orgs/mixins/models.py
+1
-0
asset_permission.py
apps/perms/utils/asset_permission.py
+0
-1
jumpserver.js
apps/static/js/jumpserver.js
+4
-1
No files found.
apps/assets/views/admin_user.py
View file @
2d07eeb1
...
...
@@ -106,8 +106,6 @@ class AdminUserAssetsView(PermissionsMixin, SingleObjectMixin, ListView):
context
=
{
'app'
:
_
(
'Assets'
),
'action'
:
_
(
'Admin user detail'
),
"total_amount"
:
len
(
self
.
queryset
),
'unreachable_amount'
:
len
([
asset
for
asset
in
self
.
queryset
if
asset
.
connectivity
is
False
])
}
kwargs
.
update
(
context
)
return
super
()
.
get_context_data
(
**
kwargs
)
...
...
apps/common/mixins/serializers.py
View file @
2d07eeb1
...
...
@@ -32,8 +32,6 @@ class BulkSerializerMixin(object):
id_value
=
id_field
.
to_internal_value
(
data
.
get
(
"id"
))
else
:
id_value
=
id_field
.
to_internal_value
(
data
.
get
(
"pk"
))
print
(
">>>>>>>>>>>>>>>>>>>"
)
print
(
id_attr
)
ret
[
id_attr
]
=
id_value
return
ret
...
...
apps/orgs/mixins/models.py
View file @
2d07eeb1
# -*- coding: utf-8 -*-
#
import
traceback
from
django.db
import
models
from
django.utils.translation
import
ugettext_lazy
as
_
from
django.core.exceptions
import
ValidationError
...
...
apps/perms/utils/asset_permission.py
View file @
2d07eeb1
...
...
@@ -513,7 +513,6 @@ class AssetPermissionUtil(AssetPermissionCacheMixin):
"""
self
.
get_assets_without_cache
()
nodes_assets
=
self
.
tree
.
get_nodes_with_assets
()
print
(
nodes_assets
.
keys
())
return
nodes_assets
def
get_system_users_without_cache
(
self
):
...
...
apps/static/js/jumpserver.js
View file @
2d07eeb1
...
...
@@ -608,7 +608,10 @@ jumpserver.initServerSideDataTable = function (options) {
search_list
.
map
(
function
(
val
,
index
)
{
var
kv
=
val
.
split
(
":"
);
if
(
kv
.
length
===
2
)
{
search_attr
[
kv
[
0
]]
=
kv
[
1
]
var
value
=
kv
[
1
];
value
=
value
.
replace
(
"+"
,
" "
);
console
.
log
(
value
);
search_attr
[
kv
[
0
]]
=
value
}
else
{
search_raw
.
push
(
kv
)
}
...
...
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