diff --git a/test/client-old/spec/controllers/challengesCtrlSpec.js b/test/client-old/spec/controllers/challengesCtrlSpec.js index 5501f22765..b0e12f5fd6 100644 --- a/test/client-old/spec/controllers/challengesCtrlSpec.js +++ b/test/client-old/spec/controllers/challengesCtrlSpec.js @@ -160,7 +160,7 @@ describe('Challenges Controller', function() { it('filters challenges to a single group when group id filter is set', inject(function($controller) { scope.search = { }; - scope.groups = { + scope.groupsFilter = { 0: specHelper.newGroup({_id: 'group-one'}), 1: specHelper.newGroup({_id: 'group-two'}), 2: specHelper.newGroup({_id: 'group-three'}) @@ -175,7 +175,7 @@ describe('Challenges Controller', function() { describe('selectAll', function() { it('sets all groups in seach.group to true', function() { scope.search = { }; - scope.groups = { + scope.groupsFilter = { 0: specHelper.newGroup({_id: 'group-one'}), 1: specHelper.newGroup({_id: 'group-two'}), 2: specHelper.newGroup({_id: 'group-three'}) @@ -193,7 +193,7 @@ describe('Challenges Controller', function() { describe('selectNone', function() { it('sets all groups in seach.group to false', function() { scope.search = { }; - scope.groups = { + scope.groupsFilter = { 0: specHelper.newGroup({_id: 'group-one'}), 1: specHelper.newGroup({_id: 'group-two'}), 2: specHelper.newGroup({_id: 'group-three'}) diff --git a/website/client-old/js/controllers/challengesCtrl.js b/website/client-old/js/controllers/challengesCtrl.js index 67bd27703a..164c353981 100644 --- a/website/client-old/js/controllers/challengesCtrl.js +++ b/website/client-old/js/controllers/challengesCtrl.js @@ -391,13 +391,13 @@ habitrpg.controller("ChallengesCtrl", ['$rootScope','$scope', 'Shared', 'User', }) $scope.selectAll = function(){ - $scope.search.group = _.transform($scope.groups, function(searchPool, group){ + $scope.search.group = _.transform($scope.groupsFilter, function(searchPool, group){ searchPool[group._id] = true; }); } $scope.selectNone = function(){ - $scope.search.group = _.transform($scope.groups, function(searchPool, group){ + $scope.search.group = _.transform($scope.groupsFilter, function(searchPool, group){ searchPool[group._id] = false; }); } @@ -435,7 +435,7 @@ habitrpg.controller("ChallengesCtrl", ['$rootScope','$scope', 'Shared', 'User', $scope.groupsFilter = _.uniq(_.compact(_.pluck($scope.challenges, 'group')), function(g) {return g._id}); $scope.search = { - group: _.transform($scope.groups, function(m,g) { m[g._id] = true;}), + group: _.transform($scope.groupsFilter, function(m,g) { m[g._id] = true;}), _isMember: "either", _isOwner: "either" };