Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
l y
Jumpserver
Commits
a43ac90b
Commit
a43ac90b
authored
8 years ago
by
ibuler
Browse files
Options
Download
Email Patches
Plain Diff
Modify CRLF to LF
parent
bbecbc85
dev
ccrc
dependabot/pip/requirements/ansible-4.2.0
feat_acl_muiltistrategy
feat_pam
feat_proxyterminal
feat_rbac
fix@dev@filter_meta
jms_dev
lagacy-0.4.0
master
pam
pr@dev@chore_pylint
pr@dev@escape_route
pr@dev@feat_csp
pr@dev@feat_custom_platform_auth_change
pr@dev@feat_custom_watermark
pr@dev@feat_ftp_log_file
pr@dev@feat_rdp_chinese_username
pr@dev@feat_support_sqlserver_change_password
pr@dev@feat_ticket_serial
pr@dev@feat_user_view
pr@dev@fix_actions
pr@dev@fix_dingding
pr@dev@fix_sms
pr@dev@fix_tcp_syslog
pr@dev@k8s
pr@dev@perf_base_model
pr@dev@refactor_notification_event
pr@dev@share_session_link
pr@dev@sms_setting
pr@dev@ticket
pr@dev@ticket_flow_assignes
pr@dev@vault_secret
prr@dev@fix_ldapimport
rbac
refactor_asset_user_v2
remote_app
repr@dev_v2.14_v2.15@2d6610b133512a3@fix_db_connection_not_close
repr@v2.14_dev@da2dea50032@ticket
v1.5
v2.0
v2.1
v2.10
v2.11
v2.12
v2.13
v2.14
v2.15
v2.16
v2.17
v2.18
v2.19
v2.2
v2.20
v2.21
v2.22
v2.3
v2.4
v2.5
v2.6
v2.7
v2.8
v2.9
2.0.1
2.0.0
1.5.9
1.5.8
1.5.7
1.5.6
1.5.5
1.5.4
1.5.3
1.5.2
1.5.1
1.5.0
1.4.10
1.4.9
1.4.8
1.4.7
1.4.6
1.4.5
1.4.4
1.4.3
1.4.2
1.4.1
1.4.0
1.3.3
1.3.2
1.3.1
1.3.0
1.2.1
1.2.0
1.1.1
1.1.0
1.0.0
v2.22.0
v2.21.4
v2.21.3
v2.21.2
v2.21.1
v2.21.0
v2.20.3
v2.20.2
v2.20.1
v2.20.0
v2.19.2
v2.19.1
v2.19.0
v2.18.3
v2.18.2
v2.18.1
v2.18.0
v2.17.5
v2.17.4
v2.17.3
v2.17.2
v2.17.1
v2.17.0
v2.16.3
v2.16.2
v2.16.1
v2.16.0
v2.15.5
v2.15.4
v2.15.3
v2.15.2
v2.15.1
v2.15.0
v2.14.2
v2.14.1
v2.14.0
v2.13.2
v2.13.1
v2.13.0
v2.12.2
v2.12.1
v2.12.0
v2.11.4
v2.11.3
v2.11.2
v2.11.1
v2.11.0
v2.10.5
v2.10.4
v2.10.3
v2.10.2
v2.10.1
v2.10.0
v2.9.2
v2.9.1
v2.9.0
v2.8.4
v2.8.3
v2.8.2
v2.8.1
v2.8.0
v2.7.3
v2.7.2
v2.7.1
v2.7.0
v2.6.2
v2.6.1
v2.6.0
v2.5.4
v2.5.3
v2.5.2
v2.5.1
v2.5.0
v2.4.5
v2.4.4
v2.4.3
v2.4.2
v2.4.1
v2.4.0
v2.3.3
v2.3.2
v2.3.1
v2.3.0
v2.2.3
v2.2.2
v2.2.1
v2.2.0
v2.1.2
v2.1.1
v2.1.0
v2.0.2
v1.4.10
v1.4.7
v1.4.4
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
apps/__init__.py
+7
-7
apps/__init__.py
apps/users/api_urls.py
+15
-17
apps/users/api_urls.py
apps/users/serializers.py
+12
-12
apps/users/serializers.py
with
34 additions
and
36 deletions
+34
-36
apps/__init__.py
+
7
-
7
View file @
a43ac90b
#!/usr/bin/env python
# -*- coding: utf-8 -*-
#
if
__name__
==
'__main__'
:
pass
#!/usr/bin/env python
# -*- coding: utf-8 -*-
#
if
__name__
==
'__main__'
:
pass
This diff is collapsed.
Click to expand it.
apps/users/api_urls.py
+
15
-
17
View file @
a43ac90b
# -*- coding: utf-8 -*-
#
from
django.conf.urls
import
url
,
include
from
rest_framework
import
routers
from
.api
import
UserViewSet
router
=
routers
.
DefaultRouter
()
router
.
register
(
r
'users'
,
UserViewSet
)
urlpatterns
=
[
url
(
r
'v1/'
,
include
(
router
.
urls
)),
url
(
r
'^api-auth/'
,
include
(
'rest_framework.urls'
,
namespace
=
'rest_framework'
))
]
# -*- coding: utf-8 -*-
#
from
django.conf.urls
import
url
,
include
from
rest_framework
import
routers
from
.api
import
UserViewSet
router
=
routers
.
DefaultRouter
()
router
.
register
(
r
'users'
,
UserViewSet
)
urlpatterns
=
[
url
(
r
'v1/'
,
include
(
router
.
urls
)),
url
(
r
'^api-auth/'
,
include
(
'rest_framework.urls'
,
namespace
=
'rest_fr
\ No newline at end of file
This diff is collapsed.
Click to expand it.
apps/users/serializers.py
+
12
-
12
View file @
a43ac90b
# -*- coding: utf-8 -*-
#
from
rest_framework
import
serializers
from
.models
import
Role
,
User
,
UserGroup
class
UserSerializer
(
serializers
.
HyperlinkedModelSerializer
):
class
Meta
:
model
=
User
fields
=
'__all__'
# -*- coding: utf-8 -*-
#
from
rest_framework
import
serializers
from
.models
import
Role
,
User
,
UserGroup
class
UserSerializer
(
serializers
.
HyperlinkedModelSerializer
):
class
Meta
:
model
=
User
fields
=
\ No newline at end of file
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
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
Menu
Projects
Groups
Snippets
Help