Add idc

apps/assets/forms.py

@@ -50,12 +50,31 @@ class AssetGroupForm(forms.ModelForm):
         }
 
 
-class IdcForm(forms.ModelForm):
+class IDCForm(forms.ModelForm):
+    assets = forms.ModelMultipleChoiceField(queryset=Asset.objects.all(),
+                                            label=_('Asset'),
+                                            required=False,
+                                            widget=forms.SelectMultiple(
+                                                attrs={'class': 'select2', 'data-placeholder': _('Select assets')})
+                                            )
+
+    def __init__(self, *args, **kwargs):
+        if kwargs.get('instance'):
+            initial = kwargs.get('initial', {})
+            initial['assets'] = kwargs['instance'].assets.all()
+        super(IDCForm, self).__init__(*args, **kwargs)
+
+    def _save_m2m(self):
+        super(IDCForm, self)._save_m2m()
+        assets = self.cleaned_data['assets']
+        self.instance.assets.clear()
+        self.instance.assets.add(*tuple(assets))
+
     class Meta:
         model = IDC
         fields = ['name', "bandwidth", "operator", 'contact', 'phone', 'address', 'network', 'comment']
         widgets = {
-            'name': forms.TextInput(attrs={'placeholder': 'Name'}),
+            'name': forms.TextInput(attrs={'placeholder': _('Name')}),
             'network': forms.Textarea(
                 attrs={'placeholder': '192.168.1.0/24\n192.168.2.0/24'})
         }

apps/assets/models.py

@@ -136,7 +136,7 @@ class Asset(models.Model):
     password = models.CharField(max_length=256, null=True, blank=True, verbose_name=_("Admin password"))
     admin_user = models.ForeignKey(AdminUser, null=True, on_delete=models.SET_NULL, verbose_name=_("Admin user"))
     system_user = models.ManyToManyField(SystemUser, blank=True, verbose_name=_("System User"))
-    idc = models.ForeignKey(IDC, null=True, blank=True, on_delete=models.SET_NULL, verbose_name=_('IDC'))
+    idc = models.ForeignKey(IDC, null=True, related_name='assets', on_delete=models.SET_NULL, verbose_name=_('IDC'))
     mac_addr = models.CharField(max_length=20, null=True, blank=True, verbose_name=_("Mac address"))
     brand = models.CharField(max_length=64, null=True, blank=True, verbose_name=_('Brand'))
     cpu = models.CharField(max_length=64, null=True, blank=True, verbose_name=_('CPU'))

apps/assets/templates/assets/asset_group_create.html

@@ -27,22 +27,10 @@
                         </div>
                     </div>
                     <div class="ibox-content">
-                        <form method="post" id="userForm" class="form-horizontal" action="" >
+                        <form method="post" class="form-horizontal" action="" >
                             {% csrf_token %}
                             {{ form.name|bootstrap_horizontal }}
                             {{ form.assets|bootstrap_horizontal }}
-
-{#                            <div class="form-group">#}
-{#                                <label for="users" class="col-sm-2 control-label">{% trans 'Asset' %}</label>#}
-{#                                <div class="col-sm-9">#}
-{#                                    <select name="assets" id="assets" data-placeholder="{% trans 'Select asset' %}" class="select2 form-control m-b" multiple  tabindex="2">#}
-{#                                        {% for asset in assets %}#}
-{#                                            <option value="{{ asset.id }}">{{ asset.ip }}:{{ asset.port }}</option>#}
-{#                                        {% endfor %}#}
-{#                                    </select>#}
-{#                                </div>#}
-{#                            </div>#}
-
                             {{ form.comment|bootstrap_horizontal }}
 
                             <div class="form-group">

apps/assets/templates/assets/idc_create.html

+{% extends 'base.html' %}
+{% load i18n %}
+{% load static %}
+{% load bootstrap %}
+{% block custom_head_css_js %}
+    <link href="{% static "css/plugins/select2/select2.min.css" %}" rel="stylesheet">
+    <script src="{% static "js/plugins/select2/select2.full.min.js" %}"></script>
+{% endblock %}
+
+{% block content %}
+    <div class="wrapper wrapper-content animated fadeInRight">
+        <div class="row">
+            <div class="col-sm-12">
+                <div class="ibox float-e-margins">
+                    <div class="ibox-title">
+                        <h5>{% trans 'Create idc' %}</h5>
+                        <div class="ibox-tools">
+                            <a class="collapse-link">
+                                <i class="fa fa-chevron-up"></i>
+                            </a>
+                            <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+                                <i class="fa fa-wrench"></i>
+                            </a>
+                            <a class="close-link">
+                                <i class="fa fa-times"></i>
+                            </a>
+                        </div>
+                    </div>
+                    <div class="ibox-content">
+                        <form method="post" class="form-horizontal" action="" >
+                            {% csrf_token %}
+                            {{ form.name|bootstrap_horizontal }}
+                            {{ form.assets|bootstrap_horizontal }}
+                            {{ form.bandwidth|bootstrap_horizontal }}
+                            {{ form.operator|bootstrap_horizontal }}
+                            {{ form.contact|bootstrap_horizontal }}
+                            {{ form.phone|bootstrap_horizontal }}
+                            {{ form.address|bootstrap_horizontal }}
+                            {{ form.network|bootstrap_horizontal }}
+                            {{ form.comment|bootstrap_horizontal }}
+
+                            <div class="form-group">
+                                <div class="col-sm-4 col-sm-offset-2">
+                                    <button class="btn btn-white" type="reset">{% trans 'Reset' %}</button>
+                                    <button id="submit_button" class="btn btn-primary" type="submit">{% trans 'Submit' %}</button>
+                                </div>
+                            </div>
+                        </form>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+{% endblock %}
+{% block custom_foot_js %}
+    <script>
+        $(document).ready(function () {
+            $('.select2').select2();
+        })
+    </script>
+{% endblock %}
\ No newline at end of file

apps/assets/templates/assets/idc_list.html

+{% extends '_list_base.html' %}
+{% load i18n %}
+{% load common_tags %}
+{% block content_left_head %}
+    <a href="{% url 'assets:idc-create' %}" class="btn btn-sm btn-primary "> {% trans "Create IDC" %} </a>
+{% endblock %}
+
+{% block table_head %}
+    <th class="text-center">{% trans 'ID' %}</th>
+    <th class="text-center"><a href="{% url 'assets:idc-list' %}?sort=name">{% trans 'Name' %}</a></th>
+    <th class="text-center">{% trans 'Asset num' %}</th>
+    <th class="text-center">{% trans 'Bandwidth' %}</th>
+    <th class="text-center">{% trans 'Contact' %}</th>
+    <th class="text-center">{% trans 'Phone' %}</th>
+    <th class="text-center">{% trans 'Address' %}</th>
+    <th class="text-center"></th>
+{% endblock %}
+
+{% block table_body %}
+     {% for idc in idc_list %}
+         <tr class="gradeX">
+             <td class="text-center">{{ idc.id }}</td>
+             <td class="text-center">{{ idc.name }}</td>
+             <td class="text-center">{{ idc.assets.count }}</td>
+             <td class="text-center">{{ idc.bandwidth }}</td>
+             <td class="text-center">{{ idc.contact }}</td>
+             <td class="text-center">{{ idc.phone }}</td>
+             <td class="text-center">{{ idc.address }}</td>
+             <td class="text-center">
+                 <a href="{% url 'assets:idc-update' pk=idc.id %}" class="btn btn-xs btn-info">{% trans 'Update' %}</a>
+                 <a href="{% url 'assets:idc-delete' pk=idc.id %}" class="btn btn-xs btn-danger del">{% trans 'Delete' %}</a>
+             </td>
+         </tr>
+     {% endfor %}
+{% endblock %}

apps/assets/urls.py

@@ -16,12 +16,17 @@ urlpatterns = [
     url(r'^asset$', views.AssetListView.as_view(), name='asset-list'),
     url(r'^asset/create$', views.AssetCreateView.as_view(), name='asset-create'),
     url(r'^asset/(?P<pk>[0-9]+)$', views.AssetDetailView.as_view(), name='asset-detail'),
-    url(r'^asset/(?P<pk>[0-9]+)$/update', views.AssetUpdateView.as_view(), name='asset-update'),
+    url(r'^asset/(?P<pk>[0-9]+)/update', views.AssetUpdateView.as_view(), name='asset-update'),
     url(r'^asset/(?P<pk>[0-9]+)/delete$', views.AssetDeleteView.as_view(), name='asset-delete'),
     url(r'^asset-group$', views.AssetGroupListView.as_view(), name='asset-group-list'),
     url(r'^asset-group/create$', views.AssetGroupCreateView.as_view(), name='asset-group-create'),
     url(r'^asset-group/(?P<pk>[0-9]+)$', views.AssetGroupDetailView.as_view(), name='asset-group-detail'),
     url(r'^asset-group/(?P<pk>[0-9]+)/update$', views.AssetGroupUpdateView.as_view(), name='asset-group-update'),
     url(r'^asset-group/(?P<pk>[0-9]+)/delete$', views.AssetGroupDeleteView.as_view(), name='asset-group-delete'),
+    url(r'^idc$', views.IDCListView.as_view(), name='idc-list'),
+    url(r'^idc/create$', views.IDCCreateView.as_view(), name='idc-create'),
+    url(r'^idc/(?P<pk>[0-9]+)$', views.IDCDetailView.as_view(), name='idc-detail'),
+    url(r'^idc/(?P<pk>[0-9]+)/update', views.IDCUpdateView.as_view(), name='idc-update'),
+    url(r'^idc/(?P<pk>[0-9]+)/delete$', views.IDCDeleteView.as_view(), name='idc-delete'),
     # url(r'^api/v1.0/', include(router.urls)),
 ]

apps/assets/views.py

@@ -14,7 +14,7 @@ from django.urls import reverse_lazy
 from django.views.generic.detail import DetailView, SingleObjectMixin
 
 from .models import Asset, AssetGroup, IDC, AssetExtend
-from .forms import AssetForm, AssetGroupForm
+from .forms import AssetForm, AssetGroupForm, IDCForm
 from .utils import AdminUserRequiredMixin
 
 
@@ -142,3 +142,59 @@ class AssetGroupDeleteView(DeleteView):
     template_name = 'assets/delete_confirm.html'
     model = AssetGroup
     success_url = reverse_lazy('assets:asset-group-list')
+
+
+class IDCListView(ListView):
+    model = IDC
+    paginate_by = settings.CONFIG.DISPLAY_PER_PAGE
+    context_object_name = 'idc_list'
+    template_name = 'assets/idc_list.html'
+
+    def get_context_data(self, **kwargs):
+        context = {
+            'app': _('Assets'),
+            'action': _('IDC list'),
+            'keyword': self.request.GET.get('keyword', '')
+        }
+        kwargs.update(context)
+        return super(IDCListView, self).get_context_data(**kwargs)
+
+    def get_queryset(self):
+        self.queryset = super(IDCListView, 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
+
+
+class IDCCreateView(CreateView):
+    model = IDC
+    form_class = IDCForm
+    template_name = 'assets/idc_create.html'
+    success_url = reverse_lazy('assets:idc-list')
+
+    def get_context_data(self, **kwargs):
+        context = {
+            'app': 'assets',
+            'action': 'Create IDC'
+        }
+        kwargs.update(context)
+        return super(IDCCreateView, self).get_context_data(**kwargs)
+
+
+class IDCUpdateView(UpdateView):
+    pass
+
+
+class IDCDetailView(DetailView):
+    pass
+
+
+class IDCDeleteView(DeleteView):
+    pass

apps/templates/_nav.html

@@ -20,7 +20,7 @@
     <ul class="nav nav-second-level">
         <li id="asset"><a href="{% url 'assets:asset-list' %}">{% trans 'Asset' %}</a></li>
         <li id="asset-group"><a href="{% url 'assets:asset-group-list' %}">{% trans 'Asset group' %}</a></li>
-        <li id="idc"><a href="">{% trans 'IDC' %}</a></li>
+        <li id="idc"><a href="{% url 'assets:idc-list' %}">{% trans 'IDC' %}</a></li>
         <li id="admin-user"><a href="">{% trans 'Admin user' %}</a></li>
         <li id="system-user"><a href="">{% trans 'System user' %}</a></li>
         <li id=""><a href="">{% trans 'Label' %}</a></li>

apps/users/templates/users/_user.html

@@ -28,7 +28,7 @@
                         </div>
                     </div>
                     <div class="ibox-content">
-                        <form method="post" id="userForm" class="form-horizontal" action="" enctype="multipart/form-data">
+                        <form method="post" class="form-horizontal" action="" enctype="multipart/form-data">
                             {% csrf_token %}
                             <h3>{% trans 'Account' %}</h3>
                             {% block username %} {% endblock %}

apps/users/templates/users/user_group_create.html

@@ -27,7 +27,7 @@
                         </div>
                     </div>
                     <div class="ibox-content">
-                        <form method="post" id="userForm" class="form-horizontal" action="" >
+                        <form method="post" class="form-horizontal" action="" >
                             {% csrf_token %}
                             {{ form.name|bootstrap_horizontal }}