Merge branch 'master' into redis

This commit is contained in:
Jan Prochazka 2022-03-05 12:29:04 +01:00
commit 2202ae5aab

View File

@ -15,19 +15,18 @@
import WidgetsInnerContainer from './WidgetsInnerContainer.svelte'; import WidgetsInnerContainer from './WidgetsInnerContainer.svelte';
$: favorites = useFavorites(); $: favorites = useFavorites();
</script> </script>
<WidgetColumnBar> <WidgetColumnBar>
<WidgetColumnBarItem title="Saved files" name="files" height="70%" storageName="savedFilesWidget">
<SavedFilesList />
</WidgetColumnBarItem>
{#if hasPermission('files/favorites/read')} {#if hasPermission('files/favorites/read')}
<WidgetColumnBarItem title="Favorites" name="favorites" height="20%" storageName="favoritesWidget"> <WidgetColumnBarItem title="Favorites" name="favorites" storageName="favoritesWidget">
<WidgetsInnerContainer> <WidgetsInnerContainer>
<AppObjectList list={$favorites || []} module={favoriteFileAppObject} /> <AppObjectList list={$favorites || []} module={favoriteFileAppObject} />
</WidgetsInnerContainer> </WidgetsInnerContainer>
</WidgetColumnBarItem> </WidgetColumnBarItem>
{/if} {/if}
<WidgetColumnBarItem title="Saved files" name="files" storageName="savedFilesWidget">
<SavedFilesList />
</WidgetColumnBarItem>
</WidgetColumnBar> </WidgetColumnBar>