From 5bf414ffb5b4b9cf616c7a13b1c899a0816e8f84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=9F=E4=B8=96=E5=B3=B0?= <93648765@qq.com> Date: Fri, 23 Sep 2016 20:22:45 +0800 Subject: [PATCH] update add_assets-group --- .../templates/assets/asset_group_create.html | 32 +++---- .../templates/assets/asset_modal_list.html | 89 +++++++++++++++---- apps/assets/views.py | 36 ++++---- 3 files changed, 100 insertions(+), 57 deletions(-) diff --git a/apps/assets/templates/assets/asset_group_create.html b/apps/assets/templates/assets/asset_group_create.html index 0f346b53d..4ae50f068 100644 --- a/apps/assets/templates/assets/asset_group_create.html +++ b/apps/assets/templates/assets/asset_group_create.html @@ -3,8 +3,10 @@ {% load static %} {% load bootstrap %} {% block custom_head_css_js %} - - + + + + {% endblock %} {% block content %}
@@ -39,12 +41,9 @@

资产数量

- -
- - + +
+
@@ -81,22 +80,20 @@ {% block custom_foot_js %} - - {% endblock %} \ No newline at end of file diff --git a/apps/assets/templates/assets/asset_modal_list.html b/apps/assets/templates/assets/asset_modal_list.html index 7ef1152e9..a0c29b11f 100644 --- a/apps/assets/templates/assets/asset_modal_list.html +++ b/apps/assets/templates/assets/asset_modal_list.html @@ -1,12 +1,14 @@ +
- +
-
- + +
+
- @@ -17,28 +19,27 @@ - {% for asset in asset_modal_list %} + {% for asset in asset_modal_list %} - + {% if asset.id in group_assets %} + + {% else %} + + {% endif %} - {% endfor %} + {% endfor %}
+ 资产名称
- - {{ asset.hostname }} {{ asset.ip }} 虚拟机 网络设备 微信事业部
+
- - + +
diff --git a/apps/assets/views.py b/apps/assets/views.py index 859c9b808..01398a5d0 100644 --- a/apps/assets/views.py +++ b/apps/assets/views.py @@ -106,6 +106,17 @@ class AssetModalListView(AdminUserRequiredMixin, ListView): context_object_name = 'asset_modal_list' template_name = 'assets/asset_modal_list.html' + + def get_context_data(self, **kwargs): + group_id = self.request.GET.get('group_id') + if group_id: + group = AssetGroup.objects.get(id=group_id) + context = { + 'group_assets':[x.id for x in group.assets.all()] + } + kwargs.update(context) + return super(AssetModalListView, self).get_context_data(**kwargs) + class AssetGroupCreateView(AdminUserRequiredMixin, CreateView): model = AssetGroup form_class = AssetGroupForm @@ -118,22 +129,11 @@ class AssetGroupCreateView(AdminUserRequiredMixin, CreateView): context = { 'app': _('Assets'), 'action': _('Create asset group'), - 'assets': Asset.objects.all(), - # 'systemusers':SystemUser.objects.all(), + 'assets_count': 0, } kwargs.update(context) return super(AssetGroupCreateView, self).get_context_data(**kwargs) - # def form_valid(self, form): - # asset_group = form.save() - # assets_id_list = self.request.POST.getlist('assets', []) - # assets = [get_object_or_404(Asset, id=asset_id) for asset_id in assets_id_list] - # asset_group.created_by = self.request.user.username or 'Admin' - # asset_group.assets.add(*tuple(assets)) - # asset_group.save() - # return super(AssetGroupCreateView, self).form_valid(form) - - def form_valid(self, form): asset_group = form.save() @@ -164,11 +164,9 @@ class AssetGroupListView(AdminUserRequiredMixin, ListView): self.queryset = super(AssetGroupListView, self).get_queryset() self.keyword = keyword = self.request.GET.get('keyword', '') self.sort = sort = self.request.GET.get('sort', '-date_created') - if keyword: self.queryset = self.queryset.filter(Q(name__icontains=keyword) | Q(comment__icontains=keyword)) - if sort: self.queryset = self.queryset.order_by(sort) return self.queryset @@ -194,19 +192,23 @@ class AssetGroupDetailView(SingleObjectMixin, AdminUserRequiredMixin, ListView): kwargs.update(context) return super(AssetGroupDetailView, self).get_context_data(**kwargs) - - class AssetGroupUpdateView(AdminUserRequiredMixin, UpdateView): model = AssetGroup form_class = AssetGroupForm template_name = 'assets/asset_group_create.html' success_url = reverse_lazy('assets:asset-group-list') + def get(self, request, *args, **kwargs): + self.object = self.get_object(queryset=AssetGroup.objects.all()) + return super(AssetGroupUpdateView, self).get(request, *args, **kwargs) + def get_context_data(self, **kwargs): context = { 'app': _('Assets'), 'action': _('Create asset group'), - 'assets': Asset.objects.all(), + # 'assets': Asset.objects.all(), + 'assets_count': self.object.assets.all().count(), + 'group_id':self.object.id, } kwargs.update(context) return super(AssetGroupUpdateView, self).get_context_data(**kwargs)