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
guo xiaoyong
Jumpserver
Commits
c25335cf
Commit
c25335cf
authored
5 years ago
by
ibuler
Browse files
Options
Download
Email Patches
Plain Diff
[Update] 修改authbook
parent
ebbe49fa
dev
ccrc
dependabot/pip/requirements/ansible-4.2.0
feat_acl_muiltistrategy
feat_pam
feat_proxyterminal
master
pam
pr@de@perf_role_bingding_migrations
pr@dev@chore_pylint
pr@dev@connect_token_to_db
pr@dev@feat_csp
pr@dev@feat_custom_platform_auth_change
pr@dev@feat_email_task_audit
pr@dev@fix_tcp_syslog
pr@dev@perf_base_model
pr@dev@refactor_notification_event
pr@dev@refactor_tickiets
pr@dev@share_session_link
pr@dev@tdsql_v5.7
pr@dev@tidb
pr@dev@vault_secret
prr@dev@fix_ldapimport
remote_app
repr@dev_v2.23_v2.22_v2.21@379c7198@fix_esupdatefailed
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.23
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
v2.23.0
v2.22.3
v2.22.2
v2.22.1
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
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
apps/assets/backends/db.py
+0
-1
apps/assets/backends/db.py
apps/assets/models/authbook.py
+0
-4
apps/assets/models/authbook.py
apps/assets/serializers/asset_user.py
+1
-1
apps/assets/serializers/asset_user.py
apps/assets/signals_handler.py
+7
-1
apps/assets/signals_handler.py
with
8 additions
and
7 deletions
+8
-7
apps/assets/backends/db.py
+
0
-
1
View file @
c25335cf
...
...
@@ -26,5 +26,4 @@ class AuthBookBackend(BaseBackend):
}
obj
=
AuthBook
.
objects
.
create
(
**
kwargs
)
obj
.
set_auth
(
**
auth_info
)
obj
.
set_version_and_latest
()
return
obj
This diff is collapsed.
Click to expand it.
apps/assets/models/authbook.py
+
0
-
4
View file @
c25335cf
...
...
@@ -60,10 +60,6 @@ class AuthBook(AssetUser):
self
.
version
=
1
self
.
save
()
def
set_version_and_latest
(
self
):
self
.
set_version
()
self
.
set_to_latest
()
def
get_related_assets
(
self
):
return
[
self
.
asset
]
...
...
This diff is collapsed.
Click to expand it.
apps/assets/serializers/asset_user.py
+
1
-
1
View file @
c25335cf
...
...
@@ -53,7 +53,7 @@ class AssetUserSerializer(AuthSerializerMixin, BulkOrgResourceModelSerializer):
if
not
validated_data
.
get
(
"name"
)
and
validated_data
.
get
(
"username"
):
validated_data
[
"name"
]
=
validated_data
[
"username"
]
instance
=
AssetUserManager
.
create
(
**
validated_data
)
instance
.
set_
version_and
_latest
()
instance
.
set_
to
_latest
()
return
instance
...
...
This diff is collapsed.
Click to expand it.
apps/assets/signals_handler.py
+
7
-
1
View file @
c25335cf
...
...
@@ -9,7 +9,7 @@ from django.dispatch import receiver
from
common.utils
import
get_logger
,
timeit
from
common.decorator
import
on_transaction_commit
from
.models
import
Asset
,
SystemUser
,
Node
from
.models
import
Asset
,
SystemUser
,
Node
,
AuthBook
from
.tasks
import
(
update_assets_hardware_info_util
,
test_asset_connectivity_util
,
...
...
@@ -189,3 +189,9 @@ def on_asset_nodes_remove(sender, instance=None, action='', model=None,
def
on_node_update_or_created
(
sender
,
**
kwargs
):
# 刷新节点
Node
.
refresh_nodes
()
@
receiver
(
post_save
,
sender
=
AuthBook
)
def
on_authbook_created
(
sender
,
instance
=
None
,
created
=
True
,
**
kwargs
):
if
created
and
instance
:
instance
.
set_version
()
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