Skip to content

Commit

Permalink
Merge pull request #42766 from nextcloud/backport/42723/stable28
Browse files Browse the repository at this point in the history
[stable28] fix(settings): set default or unlimited user quota
  • Loading branch information
Pytal authored Jan 15, 2024
2 parents b8aa466 + a9be93e commit 6c55500
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 11 deletions.
13 changes: 8 additions & 5 deletions apps/settings/src/components/Users/UserRow.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
- @copyright Copyright (c) 2019 Gary Kim <[email protected]>
- @copyright Copyright (c) 2018 John Molakvoæ <[email protected]>
-
- @author Christopher Ng <[email protected]>
- @author Christopher Ng <[email protected]>
- @author Gary Kim <[email protected]>
- @author John Molakvoæ <[email protected]>
-
Expand Down Expand Up @@ -294,6 +294,7 @@
</template>
<script>
import { formatFileSize, parseFileSize } from '@nextcloud/files'
import { getCurrentUser } from '@nextcloud/auth'
import { showSuccess, showError } from '@nextcloud/dialogs'
Expand All @@ -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',
Expand Down Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions dist/settings-users-8351.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/settings-users-8351.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/settings-vue-settings-apps-users-management.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/settings-vue-settings-apps-users-management.js.map

Large diffs are not rendered by default.

0 comments on commit 6c55500

Please sign in to comment.