diff --git a/apps/assets/api.py b/apps/assets/api.py index f02f1411f..526a375bf 100644 --- a/apps/assets/api.py +++ b/apps/assets/api.py @@ -29,29 +29,26 @@ class IDCSerializer(serializers.ModelSerializer): class AssetGroupViewSet(viewsets.ModelViewSet): """ API endpoint that allows AssetGroup to be viewed or edited. - - some other comment - + some other comment """ queryset = AssetGroup.objects.all() serializer_class = AssetGroupSerializer class AssetViewSet(viewsets.ModelViewSet): - """ - API endpoint that allows Asset to be viewed or edited. - """ + """API endpoint that allows Asset to be viewed or edited.""" queryset = Asset.objects.all() serializer_class = AssetSerializer class IDCViewSet(viewsets.ReadOnlyModelViewSet): - """ - API endpoint that allows IDC to be viewed or edited. - """ + """API endpoint that allows IDC to be viewed or edited.""" queryset = IDC.objects.all() serializer_class = IDCSerializer + class AssetListUpdateApi(BulkDeleteApiMixin, ListBulkCreateUpdateDestroyAPIView): queryset = Asset.objects.all() - serializer_class = AssetBulkUpdateSerializer \ No newline at end of file + serializer_class = AssetBulkUpdateSerializer + + diff --git a/apps/assets/forms.py b/apps/assets/forms.py index 00e63ba73..8019645a8 100644 --- a/apps/assets/forms.py +++ b/apps/assets/forms.py @@ -45,7 +45,7 @@ class AssetCreateForm(forms.ModelForm): fields = [ 'hostname', 'ip', 'port', 'type', 'comment', 'admin_user', 'system_users', 'idc', 'groups', 'other_ip', 'remote_card_ip', 'mac_address', 'brand', 'cpu', 'memory', 'disk', 'os', 'cabinet_no', - 'cabinet_pos', 'number', 'status', 'env', 'sn','tags', + 'cabinet_pos', 'number', 'status', 'env', 'sn', 'tags', ] tags = forms.ModelMultipleChoiceField(queryset=Tag.objects.all()) widgets = { diff --git a/apps/assets/serializers.py b/apps/assets/serializers.py index 4014f4bb6..59bbde18f 100644 --- a/apps/assets/serializers.py +++ b/apps/assets/serializers.py @@ -13,7 +13,7 @@ class AssetBulkUpdateSerializer(BulkSerializerMixin, serializers.ModelSerializer class Meta(object): model = Asset list_serializer_class = BulkListSerializer - fields = ['id', 'is_active', 'hostname'] + fields = ['id', 'port', 'idc'] # def get_group_display(self, obj): # return " ".join([group.name for group in obj.groups.all()]) diff --git a/apps/assets/templates/assets/asset_list.html b/apps/assets/templates/assets/asset_list.html index 94007a798..cf2fa8e90 100644 --- a/apps/assets/templates/assets/asset_list.html +++ b/apps/assets/templates/assets/asset_list.html @@ -136,7 +136,7 @@ div.dataTables_wrapper div.dataTables_filter, show: false, backdrop: 'static', keyboard: 'false', - remote:"{% url 'assets:asset-modal-update' %}", + //remote:"{% url 'assets:asset-modal-update' %}", }); $('#asset_bulk_update_modal').on('shown.bs.modal',function(){ diff --git a/apps/assets/templates/assets/asset_modal_update.html b/apps/assets/templates/assets/asset_modal_update.html index 85165537e..c7d9ec205 100644 --- a/apps/assets/templates/assets/asset_modal_update.html +++ b/apps/assets/templates/assets/asset_modal_update.html @@ -30,6 +30,9 @@
{% for asset in assets_on_list %} @@ -42,7 +45,7 @@
- + + - @@ -173,5 +179,34 @@ SetSelect2(); }; }; + + + function fsubmit(){ + var assets_id = document.getElementsByName("assets"); + var oForm = document.getElementById('add_form'); + var parentElem = document.getElementById("add_form"); + var aDiv = parentElem.getElementsByClassName('form-group'); + if (assets_id.length === 0) { + swal({ + title: "未选择需要修改的主机", + text: "请点击选择" + }); + }else if (aDiv.length === 1) { + swal({ + title: "未选需要修改的属性", + text: "请点击选择" + }); + }else{ + var m = document.getElementsByName('assets_ids'); + alert(m.length); + for(var i=0;i +