File library issue (#446)

* Fix default state for file library, dont allow sorting by fake fields

* Fix duplicate collection presets

* Force type field to be fetched in file library

* Fix wrong assignment
This commit is contained in:
Rijk van Zanten
2020-04-21 13:20:40 -04:00
committed by GitHub
parent a86848649d
commit 92b9c79669
5 changed files with 55 additions and 9 deletions

View File

@@ -63,7 +63,7 @@
:selection.sync="selection"
:view-options.sync="viewOptions"
:view-query.sync="viewQuery"
:filters="filtersWithFolder"
:filters="filtersWithFolderAndType"
@update:filters="filters = $event"
:detail-route="'/{{project}}/files/{{primaryKey}}'"
/>
@@ -106,7 +106,7 @@ export default defineComponent({
const currentFolder = ref(null);
const filtersWithFolder = computed(() => {
const filtersWithFolderAndType = computed(() => {
if (currentFolder.value !== null) {
return [
...filters.value,
@@ -115,10 +115,40 @@ export default defineComponent({
operator: 'eq',
value: currentFolder.value,
},
{
locked: 1,
field: 'type',
operator: 'nnull',
value: 1,
},
];
}
return [
...filters.value,
{
locked: 1,
field: 'type',
operator: 'nnull',
value: 1,
},
];
});
if (viewType.value === null) {
viewType.value = 'cards';
}
if (viewOptions.value === null) {
if (viewType.value === 'cards') {
viewOptions.value = {
icon: 'insert_drive_file',
title: '{{title}}',
subtitle: '{{type}} • {{filesize}}',
};
}
}
return {
addNewLink,
batchDelete,
@@ -133,7 +163,7 @@ export default defineComponent({
viewQuery,
viewType,
currentFolder,
filtersWithFolder,
filtersWithFolderAndType,
};
function useBatchDelete() {

View File

@@ -138,7 +138,7 @@ export default defineComponent({
}
if (viewOptions.value === null) {
if ((viewType.value = 'cards')) {
if (viewType.value === 'cards') {
viewOptions.value = {
icon: 'person',
title: '{{first_name}} {{last_name}}',