Merge pull request #42766 from nextcloud/backport/42723/stable28

[stable28] fix(settings): set default or unlimited user quota
This commit is contained in:
Pytal 2024-01-15 11:51:46 -08:00 committed by GitHub
commit 6c55500dbb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 14 additions and 11 deletions

View file

@ -2,7 +2,7 @@
- @copyright Copyright (c) 2019 Gary Kim <gary@garykim.dev>
- @copyright Copyright (c) 2018 John Molakvoæ <skjnldsv@protonmail.com>
-
- @author Christopher Ng <chrng8@gmail.com>
- @author Christopher Ng <chrng8@gmail.com>
- @author Gary Kim <gary@garykim.dev>
- @author John Molakvoæ <skjnldsv@protonmail.com>
-
@ -294,6 +294,7 @@
</template>
<script>
import { formatFileSize, parseFileSize } from '@nextcloud/files'
import { getCurrentUser } from '@nextcloud/auth'
import { showSuccess, showError } from '@nextcloud/dialogs'
@ -306,8 +307,7 @@ import NcTextField from '@nextcloud/vue/dist/Components/NcTextField.js'
import UserRowActions from './UserRowActions.vue'
import UserRowMixin from '../../mixins/UserRowMixin.js'
import { isObfuscated, unlimitedQuota } from '../../utils/userUtils.ts'
import {formatFileSize, parseFileSize} from "@nextcloud/files";
import { isObfuscated, unlimitedQuota } from '../../utils/userUtils.ts';
export default {
name: 'UserRow',
@ -828,15 +828,18 @@ export default {
quota = unlimitedQuota
}
this.loading.quota = true
// ensure we only send the preset id
quota = quota.id ? quota.id : quota
try {
// If human readable format, convert to raw float format
// Else just send the raw string
const value = (parseFileSize(quota, true) || quota).toString()
await this.$store.dispatch('setUserData', {
userid: this.user.id,
key: 'quota',
// translate from locale string format to raw float format so backend can read it
value: '' + parseFileSize(quota, true)
value,
})
} catch (error) {
console.error(error)

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long