From d000a1329fcae97ce9cf0a997fb1b38b9ae98ae9 Mon Sep 17 00:00:00 2001 From: Eliot Berriot Date: Fri, 28 Sep 2018 20:45:31 +0200 Subject: [PATCH] Can now update user quota in UI --- api/funkwhale_api/manage/serializers.py | 3 +++ front/src/views/admin/users/UsersDetail.vue | 28 +++++++++++++++++++-- 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/api/funkwhale_api/manage/serializers.py b/api/funkwhale_api/manage/serializers.py index 87e34e173..5f1e25240 100644 --- a/api/funkwhale_api/manage/serializers.py +++ b/api/funkwhale_api/manage/serializers.py @@ -93,11 +93,13 @@ class ManageUserSimpleSerializer(serializers.ModelSerializer): "date_joined", "last_activity", "privacy_level", + "upload_quota", ) class ManageUserSerializer(serializers.ModelSerializer): permissions = PermissionsSerializer(source="*") + upload_quota = serializers.IntegerField(allow_null=True) class Meta: model = users_models.User @@ -113,6 +115,7 @@ class ManageUserSerializer(serializers.ModelSerializer): "last_activity", "permissions", "privacy_level", + "upload_quota", ) read_only_fields = [ "id", diff --git a/front/src/views/admin/users/UsersDetail.vue b/front/src/views/admin/users/UsersDetail.vue index 4e750cafa..21e7b9811 100644 --- a/front/src/views/admin/users/UsersDetail.vue +++ b/front/src/views/admin/users/UsersDetail.vue @@ -78,6 +78,25 @@ + + + Upload quota + + + +
+ +
+ MB +
+
+ + @@ -122,8 +141,12 @@ export default { self.isLoading = false }) }, - update (attr) { + update (attr, toNull) { let newValue = this.object[attr] + if (toNull && !newValue) { + newValue = null + } + console.log(newValue, typeof(newValue)) let params = {} if (attr === 'permissions') { params['permissions'] = {} @@ -143,7 +166,8 @@ export default { computed: { labels () { return { - inactive: this.$gettext('Determine if the user account is active or not. Inactive users cannot login or use the service.') + inactive: this.$gettext('Determine if the user account is active or not. Inactive users cannot login or use the service.'), + uploadQuota: this.$gettext('Determine how much content the user can upload. Leave empty to use the default value of the instance.') } }, allPermissions () {