krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-18 07:07:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix "Not Participating" filter checkbox on Discover Challenges screen, Fixes #13025 (#13183)

Browse Source 
* change 'role' options and filters to 'membership'

* added membership filtering function to discover challenges

* fix accidental deletion

* complete removal of roles from challenge filters

* abstract challenge "participating" filtering into mixin

* selecting "participating" and "not participating" shows all challenges
This commit is contained in:
Liza
2021-05-28 17:57:03 -04:00
committed by GitHub
parent f097077009
commit 9e655d70d2
4 changed files with 36 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
website/client/src/components/challenges/sidebar.vue
View File

@@ -34,42 +34,19 @@
</div>
</div>
</filter-group>
<filter-group :title="$t('role')">
<div
v-for="group in roleOptions"
:key="group.key"
class="form-check"
>
<div class="custom-control custom-checkbox">
<input
:id="group.key"
v-model="roleFilters"
class="custom-control-input"
type="checkbox"
:value="group.key"
>
<label
v-once
class="custom-control-label"
:for="group.key"
>{{ $t(group.label) }}</label>
</div>
</div>
</filter-group>
<filter-group
v-if="$route.name !== 'findChallenges'"
:title="$t('membership')"
class="form-group"
>
<div
v-for="group in roleOptions"
v-for="group in membershipOptions"
:key="group.key"
class="form-check"
>
<div class="custom-control custom-checkbox">
<input
:id="group.key"
v-model="roleFilters"
v-model="membershipFilters"
class="custom-control-input"
type="checkbox"
:value="group.key"
@@ -176,8 +153,8 @@ export default {
key: 'time_management',
},
],
roleFilters: [],
roleOptions: [
membershipFilters: [],
membershipOptions: [
{
label: 'participating',
key: 'participating',
@@ -186,10 +163,6 @@ export default {
label: 'not_participating',
key: 'not_participating',
},
// {
// label: 'either',
// key: 'either',
// },
],
ownershipFilters: [],
ownershipOptions: [
@@ -213,10 +186,10 @@ export default {
categoryFilters: function categoryFilters () {
this.emitFilters();
},
roleFilters: function roleFilters () {
ownershipFilters: function ownershipFilters () {
this.emitFilters();
},
ownershipFilters: function ownershipFilters () {
membershipFilters: function membershipFilters () {
this.emitFilters();
},
searchTerm: throttle(function searchTerm (newSearch) {
@@ -229,8 +202,8 @@ export default {
emitFilters () {
this.$emit('filter', {
categories: this.categoryFilters,
roles: this.roleFilters,
ownership: this.ownershipFilters,
membership: this.membershipFilters,
});
},
},