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
b2b123b4
Commit
b2b123b4
authored
Jan 10, 2018
by
ibuler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Bugfix] 用户添加报错
parent
99cd6851
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
39 additions
and
5 deletions
+39
-5
signals_handler.py
apps/assets/signals_handler.py
+1
-1
asset_group_detail.html
apps/assets/templates/assets/asset_group_detail.html
+12
-1
system_user_detail.html
apps/assets/templates/assets/system_user_detail.html
+12
-0
asset_permission_detail.html
apps/perms/templates/perms/asset_permission_detail.html
+10
-0
api.py
apps/users/api.py
+1
-1
forms.py
apps/users/forms.py
+1
-1
login.py
apps/users/views/login.py
+2
-1
No files found.
apps/assets/signals_handler.py
View file @
b2b123b4
...
...
@@ -37,7 +37,7 @@ def push_cluster_system_users_to_asset(asset):
@receiver
(
post_save
,
sender
=
Asset
,
dispatch_uid
=
"my_unique_identifier"
)
def
on_asset_created
(
sender
,
instance
=
None
,
created
=
False
,
**
kwargs
):
if
instance
and
created
:
logger
.
info
(
"Asset `` create signal received"
.
format
(
instance
))
logger
.
info
(
"Asset `
{}
` create signal received"
.
format
(
instance
))
update_asset_hardware_info_on_created
(
instance
)
test_asset_conn_on_created
(
instance
)
push_cluster_system_users_to_asset
(
instance
)
...
...
apps/assets/templates/assets/asset_group_detail.html
View file @
b2b123b4
...
...
@@ -17,6 +17,11 @@
<li
class=
"pull-right"
>
<a
class=
"btn btn-outline btn-default"
href=
"{% url 'assets:asset-group-update' pk=asset_group.id %}"
><i
class=
"fa fa-edit"
></i>
{% trans 'Update' %}
</a>
</li>
<li
class=
"pull-right"
>
<a
class=
"btn btn-outline btn-danger btn-del"
>
<i
class=
"fa fa-trash-o"
></i>
{% trans 'Delete' %}
</a>
</li>
</ul>
</div>
<div
class=
"tab-content"
>
...
...
@@ -212,7 +217,6 @@ $(document).ready(function () {
addAssets
(
assets_id
);
})
.
on
(
'click'
,
'.btn-leave-group'
,
function
()
{
var
$this
=
$
(
this
);
var
the_url
=
"{% url 'api-assets:group-update-assets' pk=asset_group.id %}"
;
...
...
@@ -225,6 +229,13 @@ $(document).ready(function () {
assets
.
remove
(
delete_asset_id
);
var
data
=
{
"assets"
:
assets
};
leaveGroup
(
$this
,
name
,
the_url
,
data
);
}).
on
(
'click'
,
'.btn-del'
,
function
()
{
var
$this
=
$
(
this
);
var
name
=
"{{ asset_group.name}}"
;
var
uid
=
"{{ asset_group.id }}"
;
var
the_url
=
'{% url "api-assets:asset-group-detail" pk=DEFAULT_PK %}'
.
replace
(
'{{ DEFAULT_PK }}'
,
uid
);
var
redirect_url
=
"{% url 'assets:asset-group-list' %}"
;
objectDelete
(
$this
,
name
,
the_url
,
redirect_url
);
})
...
...
apps/assets/templates/assets/system_user_detail.html
View file @
b2b123b4
...
...
@@ -25,6 +25,11 @@
<li
class=
"pull-right"
>
<a
class=
"btn btn-outline btn-default"
href=
"{% url 'assets:system-user-update' pk=system_user.id %}"
><i
class=
"fa fa-edit"
></i>
{% trans 'Update' %}
</a>
</li>
<li
class=
"pull-right"
>
<a
class=
"btn btn-outline btn-danger btn-del"
>
<i
class=
"fa fa-trash-o"
></i>
{% trans 'Delete' %}
</a>
</li>
</ul>
</div>
<div
class=
"tab-content"
>
...
...
@@ -259,6 +264,13 @@ $(document).ready(function () {
return
$
(
this
).
data
(
'gid'
);
}).
get
();
updateSystemUserCluster
(
clusters
);
}).
on
(
'click'
,
'.btn-del'
,
function
()
{
var
$this
=
$
(
this
);
var
name
=
"{{ system_user.name}}"
;
var
uid
=
"{{ system_user.id }}"
;
var
the_url
=
'{% url "api-assets:system-user-detail" pk=DEFAULT_PK %}'
.
replace
(
'{{ DEFAULT_PK }}'
,
uid
);
var
redirect_url
=
"{% url 'assets:system-user-list' %}"
;
objectDelete
(
$this
,
name
,
the_url
,
redirect_url
);
})
</script>
{% endblock %}
apps/perms/templates/perms/asset_permission_detail.html
View file @
b2b123b4
...
...
@@ -237,6 +237,16 @@ $(document).ready(function () {
}).
get
();
updateSystemUser
(
system_users
);
$tr
.
remove
()
}).
on
(
'click'
,
'#is_active'
,
function
()
{
var
the_url
=
'{% url "api-perms:asset-permission-detail" pk=asset_permission.id %}'
;
var
checked
=
$
(
this
).
prop
(
'checked'
);
var
body
=
{
'is_active'
:
checked
};
APIUpdateAttr
({
url
:
the_url
,
body
:
JSON
.
stringify
(
body
),
});
})
</script>
{% endblock %}
apps/users/api.py
View file @
b2b123b4
...
...
@@ -128,7 +128,7 @@ class UserAuthApi(APIView):
user_agent
=
request
.
data
.
get
(
'HTTP_USER_AGENT'
,
''
)
if
not
login_ip
:
login_ip
=
request
.
META
.
get
(
'HTTP_X_
REAL_IP
'
)
or
request
.
META
.
get
(
"REMOTE_ADDR"
)
login_ip
=
request
.
META
.
get
(
'HTTP_X_
FORWARDED_FOR
'
)
or
request
.
META
.
get
(
"REMOTE_ADDR"
)
user
,
msg
=
check_user_valid
(
username
=
username
,
password
=
password
,
...
...
apps/users/forms.py
View file @
b2b123b4
...
...
@@ -46,7 +46,7 @@ class UserCreateUpdateForm(forms.ModelForm):
}
def
save
(
self
,
commit
=
True
):
password
=
self
.
cleaned_data
.
pop
(
'password'
)
password
=
self
.
cleaned_data
.
get
(
'password'
)
user
=
super
()
.
save
(
commit
=
commit
)
if
password
:
user
.
set_password
(
password
)
...
...
apps/users/views/login.py
View file @
b2b123b4
...
...
@@ -53,7 +53,8 @@ class UserLoginView(FormView):
if
not
self
.
request
.
session
.
test_cookie_worked
():
return
HttpResponse
(
_
(
"Please enable cookies and try again."
))
auth_login
(
self
.
request
,
form
.
get_user
())
login_ip
=
self
.
request
.
META
.
get
(
'REMOTE_ADDR'
,
''
)
login_ip
=
self
.
request
.
META
.
get
(
'HTTP_X_FORWARDED_FOR'
)
or
\
self
.
request
.
META
.
get
(
'REMOTE_ADDR'
,
''
)
user_agent
=
self
.
request
.
META
.
get
(
'HTTP_USER_AGENT'
,
''
)
write_login_log_async
.
delay
(
self
.
request
.
user
.
username
,
type
=
'W'
,
...
...
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