ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6807 from Ocelot-Social-Community/6794-fix-filters-if-categories-switched-off

Browse Source 
fix(webapp): make filter menu visible if categories are inactive
This commit is contained in:
Wolfgang Huß 2023-10-31 19:12:09 +01:00 committed by GitHub
commit 7c0a825bdc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
webapp/components/FilterMenu/FilterMenuComponent.vue
View File

@ -3,7 +3,7 @@
<div class="filter-menu-options"> <div class="filter-menu-options">
<div class="filter-header"> <div class="filter-header">
<h2 class="title">{{ $t('filter-menu.filter-by') }}</h2> <h2 class="title">{{ $t('filter-menu.filter-by') }}</h2>
<div class="item-save-topics"> <div v-if="categoriesActive" class="item-save-topics">
<labeled-button <labeled-button
filled filled
:label="$t('actions.saveCategories')" :label="$t('actions.saveCategories')"
@ -62,6 +62,7 @@ export default {
}, },
methods: { methods: {
saveCategories() { saveCategories() {
if (this.categoriesActive) {
this.$apollo this.$apollo
.mutate({ .mutate({
mutation: SaveCategories(), mutation: SaveCategories(),
@ -74,6 +75,7 @@ export default {
.catch(() => { .catch(() => {
this.$toast.error(this.$t('filter-menu.save.error')) this.$toast.error(this.$t('filter-menu.save.error'))
}) })
}
}, },
}, },
} }

2
webapp/pages/index.vue
View File

@ -19,7 +19,7 @@
</client-only> </client-only>
</div> </div>
<div> <div>
<div v-if="categoriesActive && SHOW_CONTENT_FILTER_MASONRY_GRID" class="top-filter-menu"> <div v-if="SHOW_CONTENT_FILTER_MASONRY_GRID" class="top-filter-menu">
<div class="filterButtonBox"> <div class="filterButtonBox">
<div class="filterButtonMenu" :class="{ 'hide-filter': hideByScroll }"> <div class="filterButtonMenu" :class="{ 'hide-filter': hideByScroll }">
<base-button <base-button