Skip to content

fix(settings): set default or unlimited user quota #42723

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
skjnldsv merged 2 commits into from
Jan 12, 2024
Merged

fix(settings): set default or unlimited user quota #42723

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a34cf8
fix(settings): set default or unlimited user quota
skjnldsv Jan 11, 2024
e2a828c
chore(assets): Recompile assets
skjnldsv Jan 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
fix(settings): set default or unlimited user quota 
Signed-off-by: John Molakvoæ <[email protected]>
  • Loading branch information
@skjnldsv
skjnldsv committed Jan 12, 2024
commit 0a34cf846fdc71dbc45d4e5d1998f7725a69977a
13 changes: 8 additions & 5 deletions apps/settings/src/components/Users/UserRow.vue
View file
Open in desktop
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