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

challenges: include challenges that user created, or belongs to, even if

Browse Source 
not in group anymore
This commit is contained in:
Tyler Renelle
2013-11-14 20:30:25 -08:00
parent 550ca394a9
commit 3461d67995
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
public/js/controllers/challengesCtrl.js
View File

@@ -3,15 +3,14 @@
habitrpg.controller("ChallengesCtrl", ['$scope', 'User', 'Challenges', 'Notification', '$compile', 'Groups', '$state',
function($scope, User, Challenges, Notification, $compile, Groups, $state) {
// FIXME get this from cache
Groups.Group.query({type:'party,guilds,tavern'}, function(groups){
$scope.groups = groups;
// FIXME $scope.challenges needs to be resolved first (see app.js)
Challenges.Challenge.query(function(challenges){
$scope.challenges = challenges;
$scope.groups = _.uniq(_.pluck(challenges, 'group'), function(g){return g._id});
$scope.search = {
group: _.transform(groups, function(m,g){m[g._id]=true;})
group: _.transform($scope.groups, function(m,g){m[g._id]=true;})
};
});
// FIXME $scope.challenges needs to be resolved first (see app.js)
$scope.challenges = Challenges.Challenge.query();
// we should fix this, that's pretty brittle
// override score() for tasks listed in challenges-editing pages, so that nothing happens