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

Correct indentation and equality checks on shuldShowChallenge

Browse Source
This commit is contained in:
Blade Barringer
2015-07-24 10:32:33 -05:00
parent eea01216d7
commit cb27c3dc44
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
website/public/js/controllers/challengesCtrl.js
View File

@@ -310,14 +310,17 @@ habitrpg.controller("ChallengesCtrl", ['$rootScope','$scope', 'Shared', 'User',
} }
} }
$scope.shouldShow = function(task, list, prefs){ function _shouldShowChallenge(chal) {
return true; // Have to check that the leader object exists first in the
}; // case where a challenge's leader deletes their account
var userIsOwner = (chal.leader && chal.leader._id) === User.user.id;
function _shouldShowChallenge(chal) { var groupSelected = $scope.search.group[chal.group._id];
// Have to check that the leader object exists first in the var checkOwner = $scope.search._isOwner === 'either' || (userIsOwner === $scope.search._isOwner);
// case where a challenge's leader deletes their account var checkMember = $scope.search._isMember === 'either' || (chal._isMember === $scope.search._isMember);
var userIsOwner = (chal.leader && chal.leader._id) == User.user.id;
return groupSelected && checkOwner && checkMember;
}
function _backToChallenges(){ function _backToChallenges(){
$scope.popoverEl.popover('destroy'); $scope.popoverEl.popover('destroy');
@@ -327,9 +330,6 @@ habitrpg.controller("ChallengesCtrl", ['$rootScope','$scope', 'Shared', 'User',
User.log({}); User.log({});
} }
var groupSelected = $scope.search.group[chal.group._id];
var checkOwner = $scope.search._isOwner === 'either' || (userIsOwner === $scope.search._isOwner);
var checkMember = $scope.search._isMember === 'either' || (chal._isMember === $scope.search._isMember);
// Fetch single challenge if a cid is present; fetch multiple challenges // Fetch single challenge if a cid is present; fetch multiple challenges
// otherwise // otherwise