github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

[Bugfix] 修复无法记录日志的bug

pull/828/merge
ibuler 2017-12-21 15:28:21 +08:00
parent 76df1de634
commit e1b23a7cb4
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/ops/ansible/inventory.py
View File

@ -62,6 +62,7 @@ class BaseHost(Host):
self.set_variable("ansible_become_pass", become.get('pass', '')) self.set_variable("ansible_become_pass", become.get('pass', ''))
else: else:
self.set_variable("ansible_become", False) self.set_variable("ansible_become", False)
print(self.get_vars())
def __set_extra_variables(self): def __set_extra_variables(self):
for k, v in self.host_data.get('vars', {}).items(): for k, v in self.host_data.get('vars', {}).items():

2
apps/ops/utils.py
View File

@ -58,7 +58,6 @@ def get_inventory(hostname_list, run_as_admin=False, run_as=None, become_info=No
) )
@record_adhoc
def get_adhoc_runner(hostname_list, run_as_admin=False, run_as=None, become_info=None): def get_adhoc_runner(hostname_list, run_as_admin=False, run_as=None, become_info=None):
inventory = get_inventory( inventory = get_inventory(
hostname_list, run_as_admin=run_as_admin, hostname_list, run_as_admin=run_as_admin,
@ -68,6 +67,7 @@ def get_adhoc_runner(hostname_list, run_as_admin=False, run_as=None, become_info
return runner return runner
@record_adhoc
def run_adhoc_object(adhoc, **options): def run_adhoc_object(adhoc, **options):
""" """
:param adhoc: Instance of AdHoc :param adhoc: Instance of AdHoc

1
apps/perms/views.py
View File

@ -19,7 +19,6 @@ from .forms import AssetPermissionForm
class AssetPermissionListView(AdminUserRequiredMixin, ListView): class AssetPermissionListView(AdminUserRequiredMixin, ListView):
model = AssetPermission model = AssetPermission
paginate_by = settings.CONFIG.DISPLAY_PER_PAGE
context_object_name = 'asset_permission_list' context_object_name = 'asset_permission_list'
template_name = 'perms/asset_permission_list.html' template_name = 'perms/asset_permission_list.html'

8
apps/users/templates/users/user_detail.html
View File

@ -86,10 +86,10 @@
<td>{% trans 'Role' %}:</td> <td>{% trans 'Role' %}:</td>
<td><b>{{ user_object.get_role_display }}</b></td> <td><b>{{ user_object.get_role_display }}</b></td>
</tr> </tr>
<tr> {# <tr>#}
<td>{% trans 'Enable OTP' %}:</td> {# <td>{% trans 'Enable OTP' %}:</td>#}
<td><b>{{ user_object.enable_otp|yesno:"Yes,No,Unknown"}}</b></td> {# <td><b>{{ user_object.enable_otp|yesno:"Yes,No,Unknown"}}</b></td>#}
</tr> {# </tr>#}
<tr> <tr>
<td>{% trans 'Date expired' %}:</td> <td>{% trans 'Date expired' %}:</td>
<td><b>{{ user_object.date_expired|date:"Y-m-j H:i:s" }}</b></td> <td><b>{{ user_object.date_expired|date:"Y-m-j H:i:s" }}</b></td>