From 05334550b06b3d960ea7d1608937cf0492e49cab Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Fri, 15 Nov 2013 17:36:36 -0800 Subject: [PATCH] [#1837] separate groups filter from "create new challenge"-available groups --- public/js/controllers/challengesCtrl.js | 3 ++- views/options/social/challenges.jade | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/public/js/controllers/challengesCtrl.js b/public/js/controllers/challengesCtrl.js index edb8a4bcd5..82854bade3 100644 --- a/public/js/controllers/challengesCtrl.js +++ b/public/js/controllers/challengesCtrl.js @@ -4,9 +4,10 @@ habitrpg.controller("ChallengesCtrl", ['$scope', 'User', 'Challenges', 'Notifica function($scope, User, Challenges, Notification, $compile, Groups, $state) { // FIXME $scope.challenges needs to be resolved first (see app.js) + $scope.groups = Groups.Group.query({type:'party,guilds,tavern'}); Challenges.Challenge.query(function(challenges){ $scope.challenges = challenges; - $scope.groups = _.uniq(_.pluck(challenges, 'group'), function(g){return g._id}); + $scope.groupsFilter = _.uniq(_.pluck(challenges, 'group'), function(g){return g._id}); $scope.search = { group: _.transform($scope.groups, function(m,g){m[g._id]=true;}) }; diff --git a/views/options/social/challenges.jade b/views/options/social/challenges.jade index 075b82cac2..7baa10ce5e 100644 --- a/views/options/social/challenges.jade +++ b/views/options/social/challenges.jade @@ -65,7 +65,7 @@ script(type='text/ng-template', id='partials/options.social.challenges.html') a.btn.btn-mini.pull-left(ng-click='selectAll()') All a.btn.btn-mini(ng-click='selectNone()') None br - label.checkbox(ng-repeat='group in groups') + label.checkbox(ng-repeat='group in groupsFilter') input(type='checkbox', ng-model='search.group[group._id]') | {{group.name}} h4 Membership