github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-13 13:59:17 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'dev' into 1.5.5

Browse Source
This commit is contained in:
ibuler
2019-10-31 11:09:59 +08:00
parent fe235823b4 87247da0ec
commit 23b777b23b
9 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/authentication/signals_handlers.py
View File

@@ -47,7 +47,7 @@ def on_openid_login_success(sender, user=None, request=None, **kwargs):
@receiver(populate_user)
def on_ldap_create_user(sender, user, ldap_user, **kwargs):
if user and user.name != 'admin':
if user and user.username != 'admin':
user.source = user.SOURCE_LDAP
user.save()

2
apps/authentication/templates/authentication/_access_key_modal.html
View File

@@ -21,7 +21,7 @@
<div class="uc pull-left m-r-0 m-t-10">
<button class="btn btn-primary btn-sm" id="create-btn" href="#"> {% trans "Create" %} </button>
</div>
<table class="table table-striped table-bordered table-hover " id="access_key_list_table">
<table class="table table-striped table-bordered table-hover " id="access_key_list_table" style="width: 100%">
<thead>
<tr>
<th class="text-center">