diff options
| author | John Molakvoæ <skjnldsv@protonmail.com> | 2023-11-03 19:49:53 +0100 |
|---|---|---|
| committer | John Molakvoæ <skjnldsv@protonmail.com> | 2023-11-08 08:40:27 +0100 |
| commit | 32c1aebaae07b9b4d7e2dcdfca6b2cbd36a6cfc3 (patch) | |
| tree | 26b047d37a3c3276e9336936f0d5c8bbde949869 /apps/files/src/components | |
| parent | 50417bcee8f103fb569a860b63cf8cf1e6bc1c18 (diff) | |
| download | nextcloud-server-32c1aebaae07b9b4d7e2dcdfca6b2cbd36a6cfc3.tar.gz nextcloud-server-32c1aebaae07b9b4d7e2dcdfca6b2cbd36a6cfc3.zip | |
fix(cypress): formatFileSize change revert from files library
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
Diffstat (limited to 'apps/files/src/components')
| -rw-r--r-- | apps/files/src/components/FileEntry/FileEntryActions.vue | 36 | ||||
| -rw-r--r-- | apps/files/src/components/NavigationQuota.vue | 4 |
2 files changed, 19 insertions, 21 deletions
diff --git a/apps/files/src/components/FileEntry/FileEntryActions.vue b/apps/files/src/components/FileEntry/FileEntryActions.vue index 3637c9472d5..5a1b3235d90 100644 --- a/apps/files/src/components/FileEntry/FileEntryActions.vue +++ b/apps/files/src/components/FileEntry/FileEntryActions.vue @@ -42,25 +42,23 @@ :open.sync="openedMenu" @close="openedSubmenu = null"> <!-- Default actions list--> - <template> - <NcActionButton v-for="action in enabledMenuActions" - :key="action.id" - :class="{ - [`files-list__row-action-${action.id}`]: true, - [`files-list__row-action--menu`]: isMenu(action.id) - }" - :close-after-click="!isMenu(action.id)" - :data-cy-files-list-row-action="action.id" - :is-menu="isMenu(action.id)" - :title="action.title?.([source], currentView)" - @click="onActionClick(action)"> - <template #icon> - <NcLoadingIcon v-if="loading === action.id" :size="18" /> - <NcIconSvgWrapper v-else :svg="action.iconSvgInline([source], currentView)" /> - </template> - {{ actionDisplayName(action) }} - </NcActionButton> - </template> + <NcActionButton v-for="action in enabledMenuActions" + :key="action.id" + :class="{ + [`files-list__row-action-${action.id}`]: true, + [`files-list__row-action--menu`]: isMenu(action.id) + }" + :close-after-click="!isMenu(action.id)" + :data-cy-files-list-row-action="action.id" + :is-menu="isMenu(action.id)" + :title="action.title?.([source], currentView)" + @click="onActionClick(action)"> + <template #icon> + <NcLoadingIcon v-if="loading === action.id" :size="18" /> + <NcIconSvgWrapper v-else :svg="action.iconSvgInline([source], currentView)" /> + </template> + {{ actionDisplayName(action) }} + </NcActionButton> <!-- Submenu actions list--> <template v-if="openedSubmenu && enabledSubmenuActions[openedSubmenu?.id]"> diff --git a/apps/files/src/components/NavigationQuota.vue b/apps/files/src/components/NavigationQuota.vue index 25bdcde1b45..18cd99f248b 100644 --- a/apps/files/src/components/NavigationQuota.vue +++ b/apps/files/src/components/NavigationQuota.vue @@ -51,8 +51,8 @@ export default { computed: { storageStatsTitle() { - const usedQuotaByte = formatFileSize(this.storageStats?.used, false, false) - const quotaByte = formatFileSize(this.storageStats?.quota, false, false) + const usedQuotaByte = formatFileSize(this.storageStats?.used, false, false, true) + const quotaByte = formatFileSize(this.storageStats?.quota, false, false, true) // If no quota set if (this.storageStats?.quota < 0) { |