From e1b23a7cb4ab12ae9217e17f173da173fa6c7c57 Mon Sep 17 00:00:00 2001 From: ibuler Date: Thu, 21 Dec 2017 15:28:21 +0800 Subject: [PATCH] =?UTF-8?q?[Bugfix]=20=E4=BF=AE=E5=A4=8D=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=97=A5=E5=BF=97=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/ops/ansible/inventory.py | 1 + apps/ops/utils.py | 2 +- apps/perms/views.py | 1 - apps/users/templates/users/user_detail.html | 8 ++++---- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/ops/ansible/inventory.py b/apps/ops/ansible/inventory.py index 94dfaa984..1f06060ba 100644 --- a/apps/ops/ansible/inventory.py +++ b/apps/ops/ansible/inventory.py @@ -62,6 +62,7 @@ class BaseHost(Host): self.set_variable("ansible_become_pass", become.get('pass', '')) else: self.set_variable("ansible_become", False) + print(self.get_vars()) def __set_extra_variables(self): for k, v in self.host_data.get('vars', {}).items(): diff --git a/apps/ops/utils.py b/apps/ops/utils.py index 994e81db0..3c09d598f 100644 --- a/apps/ops/utils.py +++ b/apps/ops/utils.py @@ -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): inventory = get_inventory( 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 +@record_adhoc def run_adhoc_object(adhoc, **options): """ :param adhoc: Instance of AdHoc diff --git a/apps/perms/views.py b/apps/perms/views.py index d1c44a46a..d3759d064 100644 --- a/apps/perms/views.py +++ b/apps/perms/views.py @@ -19,7 +19,6 @@ from .forms import AssetPermissionForm class AssetPermissionListView(AdminUserRequiredMixin, ListView): model = AssetPermission - paginate_by = settings.CONFIG.DISPLAY_PER_PAGE context_object_name = 'asset_permission_list' template_name = 'perms/asset_permission_list.html' diff --git a/apps/users/templates/users/user_detail.html b/apps/users/templates/users/user_detail.html index 77d0e77b0..f87c2c0c8 100644 --- a/apps/users/templates/users/user_detail.html +++ b/apps/users/templates/users/user_detail.html @@ -86,10 +86,10 @@ {% trans 'Role' %}: {{ user_object.get_role_display }} - - {% trans 'Enable OTP' %}: - {{ user_object.enable_otp|yesno:"Yes,No,Unknown"}} - +{# #} +{# {% trans 'Enable OTP' %}:#} +{# {{ user_object.enable_otp|yesno:"Yes,No,Unknown"}}#} +{# #} {% trans 'Date expired' %}: {{ user_object.date_expired|date:"Y-m-j H:i:s" }}