diff --git a/apps/assets/forms.py b/apps/assets/forms.py index 33df74a45..90283c37a 100644 --- a/apps/assets/forms.py +++ b/apps/assets/forms.py @@ -2,6 +2,7 @@ from django import forms from .models import IDC, Asset, AssetGroup +from django.utils.translation import gettext_lazy as _ class AssetForm(forms.ModelForm): @@ -15,6 +16,10 @@ class AssetForm(forms.ModelForm): "number", "status", "type", "env", "sn", "is_active", "comment" ] + widgets = { + 'groups': forms.SelectMultiple(attrs={'class': 'select2', 'data-placeholder': _('Join assetgroups')}), + } + class AssetGroupForm(forms.ModelForm): class Meta: diff --git a/apps/assets/templates/assets/asset_add.html b/apps/assets/templates/assets/asset_add.html index 23b5bbbf2..5a265253d 100644 --- a/apps/assets/templates/assets/asset_add.html +++ b/apps/assets/templates/assets/asset_add.html @@ -1,5 +1,10 @@ {% extends 'base.html' %} +{% load static %} {% load bootstrap %} +{% block custom_head_css_js %} + + +{% endblock %} {% block content %}
@@ -40,12 +45,14 @@
-
- -
- -
-
+{#
#} +{# #} +{#
#} +{# #} +{#
#} +{#
#} + + {{ form.type|bootstrap_horizontal }} {{ form.comment|bootstrap_horizontal }} @@ -79,7 +86,7 @@

所属

{{ form.idc|bootstrap_horizontal }} - {{ form.group|bootstrap_horizontal }} + {{ form.groups|bootstrap_horizontal }}

标签

@@ -103,85 +110,10 @@ {% endblock %} -{% block self_footer_js %} -{##} - +{% block custom_foot_js %} + {% endblock %} \ No newline at end of file diff --git a/apps/assets/urls.py b/apps/assets/urls.py index 53bf3beab..800381252 100644 --- a/apps/assets/urls.py +++ b/apps/assets/urls.py @@ -4,7 +4,6 @@ import views # from .api import ( # AssetGroupViewSet, AssetViewSet, IDCViewSet # ) -import views # from rest_framework import routers # router = routers.DefaultRouter() # router.register(r'assetgroup', AssetGroupViewSet)