-
-
Notifications
You must be signed in to change notification settings - Fork 4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #42766 from nextcloud/backport/42723/stable28
[stable28] fix(settings): set default or unlimited user quota
- Loading branch information
Showing
5 changed files
with
14 additions
and
11 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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]> | ||
- | ||
|
@@ -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) | ||
|
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.