diff --git a/apps/assets/api.py b/apps/assets/api.py index 896aadc88783428647eafb98379bfccfde233372..e96f1cdab068d53ba6f19b270852b8d0b28d9880 100644 --- a/apps/assets/api.py +++ b/apps/assets/api.py @@ -38,6 +38,10 @@ class AssetGroupViewSet(viewsets.ModelViewSet): queryset = AssetGroup.objects.all() serializer_class = serializers.AssetGroupSerializer +class AssetUpdateGroupApi(generics.RetrieveUpdateAPIView): + queryset = Asset.objects.all() + serializer_class = serializers.AssetUpdateGroupSerializer + permission_classes = (IsSuperUser,) class IDCViewSet(viewsets.ModelViewSet): """API endpoint that allows IDC to be viewed or edited.""" @@ -45,18 +49,21 @@ class IDCViewSet(viewsets.ModelViewSet): serializer_class = serializers.IDCSerializer permission_classes = (IsSuperUser,) - class AdminUserViewSet(viewsets.ModelViewSet): queryset = AdminUser.objects.all() serializer_class = serializers.AdminUserSerializer permission_classes = (IsSuperUser,) - class SystemUserViewSet(viewsets.ModelViewSet): queryset = SystemUser.objects.all() serializer_class = serializers.SystemUserSerializer permission_classes = (IsSuperUser,) +class SystemUserUpdateApi(generics.RetrieveUpdateAPIView): + queryset = Asset.objects.all() + serializer_class = serializers.AssetUpdateSystemUserSerializer + permission_classes = (IsSuperUser,) + # class IDCAssetsApi(generics.ListAPIView): # model = IDC diff --git a/apps/assets/serializers.py b/apps/assets/serializers.py index 7b13606e52060ce9c23058ac5f4eb97493d6e379..6e6353a866085e7a63e94007fa99f627297c1a9b 100644 --- a/apps/assets/serializers.py +++ b/apps/assets/serializers.py @@ -17,6 +17,19 @@ class AssetGroupSerializer(serializers.ModelSerializer): def get_assets_amount(obj): return obj.assets.count() +class AssetUpdateGroupSerializer(serializers.ModelSerializer): + groups = serializers.PrimaryKeyRelatedField(many=True, queryset=AssetGroup.objects.all()) + + class Meta: + model = Asset + fields = ['id', 'groups'] + +class AssetUpdateSystemUserSerializer(serializers.ModelSerializer): + system_users = serializers.PrimaryKeyRelatedField(many=True, queryset=SystemUser.objects.all()) + + class Meta: + model = Asset + fields = ['id', 'system_users'] class AdminUserSerializer(serializers.ModelSerializer): class Meta: diff --git a/apps/assets/templates/assets/asset_detail.html b/apps/assets/templates/assets/asset_detail.html index bc3a7b147963ebdc0ae649773beb0352b5612116..ca1b667edbed66838f6c37cabe12d539f2d3aa60 100644 --- a/apps/assets/templates/assets/asset_detail.html +++ b/apps/assets/templates/assets/asset_detail.html @@ -96,7 +96,7 @@
@@ -27,7 +27,7 @@
{% endblock %}
diff --git a/apps/assets/templates/assets/asset_list.html b/apps/assets/templates/assets/asset_list.html
index a2b1c306c8ed0e20bb4fcb0f55a8be9d3b2240fb..a5d43579cd41e854b2773ccfc62f0db13051d8d4 100644
--- a/apps/assets/templates/assets/asset_list.html
+++ b/apps/assets/templates/assets/asset_list.html
@@ -127,8 +127,9 @@
}},
{targets: 9, createdCell: function (td, cellData, rowData) {
var update_btn = '{% trans "Update" %}'.replace('99991937', cellData);
- var del_btn = '{% trans "Delete" %}'.replace('99991937', cellData);
+ var del_btn = '{% trans "Delete" %}'.replace('99991937', cellData);
$(td).html(update_btn + del_btn)
+
}}
],
ajax_url: '{% url "api-assets:asset-list" %}',
@@ -179,6 +180,14 @@
$form.ajaxSubmit({success: success});
})
+ })
+ .on('click', '.btn_asset_delete', function () {
+ var $this = $(this);
+ var name = $(this).closest("tr").find(":nth-child(2)").children('a').html();
+ var uid = $this.data('uid');
+ var the_url = '{% url "api-assets:asset-detail" pk=99991937 %}'.replace('99991937', uid);
+
+ objectDelete($this, name, the_url);
});
{% endblock %}
\ No newline at end of file
diff --git a/apps/assets/urls/api_urls.py b/apps/assets/urls/api_urls.py
index ca1760404569050c4fdacd26a483e17cc0dd6f9b..6957f5f8a35d5076b5da95ab1bb1ef0876ac04a4 100644
--- a/apps/assets/urls/api_urls.py
+++ b/apps/assets/urls/api_urls.py
@@ -17,6 +17,11 @@ urlpatterns = [
url(r'^v1/assets_bulk/$', api.AssetListUpdateApi.as_view(), name='asset-bulk-update'),
# url(r'^v1/idc/(?P |
---|