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

use groupsFilter for search.group

Browse Source
This commit is contained in:
Ozzystrasza
2016-09-17 00:23:16 -03:00
parent 998037e0a1
commit f3f4229e49
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/client-old/spec/controllers/challengesCtrlSpec.js
View File

@@ -160,7 +160,7 @@ describe('Challenges Controller', function() {
it('filters challenges to a single group when group id filter is set', inject(function($controller) { it('filters challenges to a single group when group id filter is set', inject(function($controller) {
scope.search = { }; scope.search = { };
scope.groups = { scope.groupsFilter = {
0: specHelper.newGroup({_id: 'group-one'}), 0: specHelper.newGroup({_id: 'group-one'}),
1: specHelper.newGroup({_id: 'group-two'}), 1: specHelper.newGroup({_id: 'group-two'}),
2: specHelper.newGroup({_id: 'group-three'}) 2: specHelper.newGroup({_id: 'group-three'})
@@ -175,7 +175,7 @@ describe('Challenges Controller', function() {
describe('selectAll', function() { describe('selectAll', function() {
it('sets all groups in seach.group to true', function() { it('sets all groups in seach.group to true', function() {
scope.search = { }; scope.search = { };
scope.groups = { scope.groupsFilter = {
0: specHelper.newGroup({_id: 'group-one'}), 0: specHelper.newGroup({_id: 'group-one'}),
1: specHelper.newGroup({_id: 'group-two'}), 1: specHelper.newGroup({_id: 'group-two'}),
2: specHelper.newGroup({_id: 'group-three'}) 2: specHelper.newGroup({_id: 'group-three'})
@@ -193,7 +193,7 @@ describe('Challenges Controller', function() {
describe('selectNone', function() { describe('selectNone', function() {
it('sets all groups in seach.group to false', function() { it('sets all groups in seach.group to false', function() {
scope.search = { }; scope.search = { };
scope.groups = { scope.groupsFilter = {
0: specHelper.newGroup({_id: 'group-one'}), 0: specHelper.newGroup({_id: 'group-one'}),
1: specHelper.newGroup({_id: 'group-two'}), 1: specHelper.newGroup({_id: 'group-two'}),
2: specHelper.newGroup({_id: 'group-three'}) 2: specHelper.newGroup({_id: 'group-three'})

6
website/client-old/js/controllers/challengesCtrl.js
View File

@@ -391,13 +391,13 @@ habitrpg.controller("ChallengesCtrl", ['$rootScope','$scope', 'Shared', 'User',
}) })
$scope.selectAll = function(){ $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; searchPool[group._id] = true;
}); });
} }
$scope.selectNone = function(){ $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; 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.groupsFilter = _.uniq(_.compact(_.pluck($scope.challenges, 'group')), function(g) {return g._id});
$scope.search = { $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", _isMember: "either",
_isOwner: "either" _isOwner: "either"
}; };