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

v3 client: misc fixes

Browse Source
This commit is contained in:
Matteo Pagliazzi
2016-05-16 12:54:43 +02:00
parent 4d08fde068
commit ab27ef47fe
5 changed files with 35 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
website/client/js/controllers/rootCtrl.js
View File

@@ -289,7 +289,7 @@ habitrpg.controller("RootCtrl", ['$scope', '$rootScope', '$location', 'User', '$
}
});
} else if (spell.target == 'tasks') {
var tasks = User.user.habits.concat(User.user.dailys).concat(User.user.rewards);
var tasks = User.user.habits.concat(User.user.dailys).concat(User.user.rewards).concat(User.user.todos);
// exclude challenge tasks
tasks = tasks.filter(function (t) {
if (!t.challenge) return true;

1
website/client/js/controllers/settingsCtrl.js
View File

@@ -176,6 +176,7 @@ habitrpg.controller('SettingsCtrl',
$scope.reset = function(){
User.reset({});
User.sync();
$rootScope.$state.go('tasks');
}