From e2072a1e02fbc6db8385ada191b9e9c4d016ae76 Mon Sep 17 00:00:00 2001 From: BaiJiangJie Date: Fri, 26 Oct 2018 21:03:09 +0800 Subject: [PATCH] =?UTF-8?q?[Update]=20=E4=BF=AE=E5=A4=8D=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E5=88=B7=E6=96=B0=E7=A1=AC=E4=BB=B6?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=EF=BC=8C=E8=8E=B7=E5=8F=96=E8=B5=84=E4=BA=A7?= =?UTF-8?q?=E4=B8=BANone(=E4=BD=BF=E7=94=A8fullname)=E5=92=8C=E6=9F=A5?= =?UTF-8?q?=E7=9C=8Bcelery=20log=20403=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/ops/inventory.py | 2 +- apps/ops/views.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/ops/inventory.py b/apps/ops/inventory.py index 117d961a9..5b5e98551 100644 --- a/apps/ops/inventory.py +++ b/apps/ops/inventory.py @@ -50,7 +50,7 @@ class JMSInventory(BaseInventory): def convert_to_ansible(self, asset, run_as_admin=False): info = { 'id': asset.id, - 'hostname': asset.hostname, + 'hostname': asset.fullname, 'ip': asset.ip, 'port': asset.port, 'vars': dict(), diff --git a/apps/ops/views.py b/apps/ops/views.py index 380fdadf4..1bbfbfc23 100644 --- a/apps/ops/views.py +++ b/apps/ops/views.py @@ -6,7 +6,7 @@ from django.views.generic import ListView, DetailView, TemplateView from common.mixins import DatetimeSearchMixin from .models import Task, AdHoc, AdHocRunHistory, CeleryTask -from common.permissions import SuperUserRequiredMixin +from common.permissions import SuperUserRequiredMixin, AdminUserRequiredMixin class TaskListView(SuperUserRequiredMixin, DatetimeSearchMixin, ListView): @@ -121,6 +121,6 @@ class AdHocHistoryDetailView(SuperUserRequiredMixin, DetailView): return super().get_context_data(**kwargs) -class CeleryTaskLogView(SuperUserRequiredMixin, DetailView): +class CeleryTaskLogView(AdminUserRequiredMixin, DetailView): template_name = 'ops/celery_task_log.html' model = CeleryTask