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
6b161d59
Commit
6b161d59
authored
Oct 20, 2016
by
ibuler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update import
parent
67ecc108
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
8 additions
and
17 deletions
+8
-17
models.py
apps/assets/models.py
+2
-2
api.py
apps/audits/api.py
+2
-2
serializers.py
apps/audits/serializers.py
+3
-3
serializers.py
apps/perms/serializers.py
+0
-10
api.py
apps/terminal/api.py
+1
-0
No files found.
apps/assets/models.py
View file @
6b161d59
...
...
@@ -322,8 +322,8 @@ class Asset(models.Model):
created_by
=
models
.
CharField
(
max_length
=
32
,
null
=
True
,
blank
=
True
,
verbose_name
=
_
(
'Created by'
))
is_active
=
models
.
BooleanField
(
default
=
True
,
verbose_name
=
_
(
'Is active'
))
date_created
=
models
.
DateTimeField
(
auto_now_add
=
True
,
null
=
True
,
blank
=
True
,
verbose_name
=
_
(
'Date added'
))
comment
=
models
.
TextField
(
max_length
=
128
,
null
=
True
,
blank
=
True
,
verbose_name
=
_
(
'Comment'
))
tags
=
models
.
ManyToManyField
(
'Tag'
,
verbose_name
=
'标签集合'
,
blank
=
True
)
comment
=
models
.
TextField
(
max_length
=
128
,
default
=
''
,
blank
=
True
,
verbose_name
=
_
(
'Comment'
))
tags
=
models
.
ManyToManyField
(
'Tag'
,
blank
=
True
,
verbose_name
=
_
(
'Tags'
)
)
def
__unicode__
(
self
):
return
'
%(ip)
s:
%(port)
s'
%
{
'ip'
:
self
.
ip
,
'port'
:
self
.
port
}
...
...
apps/audits/api.py
View file @
6b161d59
...
...
@@ -2,10 +2,10 @@
#
from
__future__
import
absolute_import
,
unicode_literals
from
rest_framework
import
generics
import
serializers
import
models
from
.
import
models
,
serializers
from
.hands
import
IsSuperUserOrTerminalUser
,
Terminal
...
...
apps/audits/serializers.py
View file @
6b161d59
#!/usr/bin/env python
# -*- coding: utf-8 -*-
#
#
from
__future__
import
absolute_import
,
unicode_literals
from
rest_framework
import
serializers
import
models
from
.
import
models
class
ProxyLogSerializer
(
serializers
.
ModelSerializer
):
...
...
apps/perms/serializers.py
View file @
6b161d59
# -*- coding: utf-8 -*-
#
from
rest_framework
import
serializers
class
TerminalHeatbeatSerializer
(
serializers
.
ModelSerializer
):
class
Meta
:
model
=
TerminalHeatbeat
fields
=
[
'terminal'
]
if
__name__
==
'__main__'
:
pass
apps/terminal/api.py
View file @
6b161d59
...
...
@@ -18,6 +18,7 @@ class TerminalCreateListApi(ListCreateAPIView):
def
post
(
self
,
request
,
*
args
,
**
kwargs
):
name
=
unsign
(
request
.
data
.
get
(
'name'
,
''
))
print
(
name
)
if
name
:
terminal
=
get_object_or_none
(
Terminal
,
name
=
name
)
if
terminal
:
...
...
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