fix(Users/Quota setting): Prevent floating point value from getting t…

…runcated in locales other than english fixes #18468 Signed-off-by: Marcel Klehr <mklehr@gmx.net>
nextcloud · Jan 15, 2024 · 6cfcded · 6cfcded
1 parent 400524a
commit 6cfcded
Show file tree

Hide file tree

Showing 6 changed files with 97 additions and 108 deletions.
diff --git a/apps/settings/src/components/UserList.vue b/apps/settings/src/components/UserList.vue
@@ -262,6 +262,7 @@ import Vue from 'vue'
 import NcModal from '@nextcloud/vue/dist/Components/NcModal.js'
 import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
 import NcMultiselect from '@nextcloud/vue/dist/Components/NcMultiselect.js'
+import { formatFileSize, parseFileSize } from '@nextcloud/files'
 
 import userRow from './UserList/UserRow.vue'
 
@@ -486,10 +487,10 @@ export default {
 		 */
 		validateQuota(quota) {
 			// only used for new presets sent through @Tag
-			const validQuota = OC.Util.computerFileSize(quota)
+			const validQuota = parseFileSize(quota, true)
 			if (validQuota !== null && validQuota >= 0) {
 				// unify format output
-				quota = OC.Util.humanFileSize(OC.Util.computerFileSize(quota))
+				quota = formatFileSize(parseFileSize(quota, true))
 				this.newUser.quota = { id: quota, label: quota }
 				return this.newUser.quota
 			}

diff --git a/apps/settings/src/components/UserList/UserRow.vue b/apps/settings/src/components/UserList/UserRow.vue
@@ -268,6 +268,7 @@
 
 <script>
 import ClickOutside from 'vue-click-outside'
+import { formatFileSize, parseFileSize } from '@nextcloud/files'
 
 import {
 	NcPopoverMenu,
@@ -688,7 +689,7 @@ export default {
 				await this.$store.dispatch('setUserData', {
 					userid: this.user.id,
 					key: 'quota',
-					value: quota,
+					value: '' + parseFileSize(quota, true),
 				})
 			} catch (error) {
 				console.error(error)
@@ -706,10 +707,10 @@ export default {
 		 */
 		validateQuota(quota) {
 			// only used for new presets sent through @Tag
-			const validQuota = OC.Util.computerFileSize(quota)
+			const validQuota = parseFileSize(quota, true)
 			if (validQuota !== null && validQuota >= 0) {
 				// unify format output
-				return this.setUserQuota(OC.Util.humanFileSize(OC.Util.computerFileSize(quota)))
+				return this.setUserQuota(formatFileSize(parseFileSize(quota, true)))
 			}
 			// if no valid do not change
 			return false

diff --git a/apps/settings/src/store/users.js b/apps/settings/src/store/users.js
@@ -31,6 +31,7 @@ import api from './api.js'
 import axios from '@nextcloud/axios'
 import { generateOcsUrl } from '@nextcloud/router'
 import logger from '../logger.js'
+import { parseFileSize } from '@nextcloud/files'
 
 const orderGroups = function(groups, orderBy) {
 	/* const SORT_USERCOUNT = 1;
@@ -211,7 +212,7 @@ const mutations = {
 	},
 	setUserData(state, { userid, key, value }) {
 		if (key === 'quota') {
-			const humanValue = OC.Util.computerFileSize(value)
+			const humanValue = parseFileSize(value, true)
 			state.users.find(user => user.id === userid)[key][key] = humanValue !== null ? humanValue : value
 		} else {
 			state.users.find(user => user.id === userid)[key] = value

diff --git a/core/src/components/UserMenu/UserMenuEntry.vue b/core/src/components/UserMenu/UserMenuEntry.vue
@@ -30,11 +30,11 @@
 			<NcLoadingIcon v-if="loading"
 				class="menu-entry__loading-icon"
 				:size="18" />
-			<img v-else :src="cachedIcon" alt="" />
+			<img v-else :src="cachedIcon" alt="">
 			{{ name }}
 		</a>
 		<button v-else>
-			<img :src="cachedIcon" alt="" />
+			<img :src="cachedIcon" alt="">
 			{{ name }}
 		</button>
 	</li>