Merge branch 'release' into develop
This commit is contained in:
Generated
+1
-1
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "habitica",
|
||||
"version": "4.156.2",
|
||||
"version": "4.156.3",
|
||||
"lockfileVersion": 1,
|
||||
"requires": true,
|
||||
"dependencies": {
|
||||
|
||||
+1
-1
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "habitica",
|
||||
"description": "A habit tracker app which treats your goals like a Role Playing Game.",
|
||||
"version": "4.156.2",
|
||||
"version": "4.156.3",
|
||||
"main": "./website/server/index.js",
|
||||
"dependencies": {
|
||||
"@babel/core": "^7.11.6",
|
||||
|
||||
@@ -51,7 +51,8 @@ export default {
|
||||
groupPlans: 'groupPlans.data',
|
||||
}),
|
||||
currentGroup () {
|
||||
const groupFound = this.groupPlans.find(group => group._id === this.groupId);
|
||||
const groupFound = this.groupPlans
|
||||
&& this.groupPlans.find(group => group._id === this.groupId);
|
||||
|
||||
return groupFound;
|
||||
},
|
||||
|
||||
@@ -637,7 +637,10 @@ export default {
|
||||
// as default filter for daily
|
||||
// and set the filter as 'due' only when the component first
|
||||
// loads and not on subsequent reloads.
|
||||
if (type === 'daily' && filter === '' && this.user.preferences.dailyDueDefaultView) {
|
||||
if (
|
||||
type === 'daily' && filter === '' && !this.challenge
|
||||
&& this.user.preferences.dailyDueDefaultView
|
||||
) {
|
||||
filter = 'due'; // eslint-disable-line no-param-reassign
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user