Commit e7e4cf6dac7d0ab267d67ef3094909220e31f776
1 parent
4f9d48d9
Exists in
master
and in
2 other branches
Do not duplicate filters when logging in and out
Showing
1 changed file
with
8 additions
and
3 deletions
Show diff stats
ConfJuvApp/www/js/controllers.js
@@ -124,6 +124,11 @@ angular.module('confjuvapp.controllers', []) | @@ -124,6 +124,11 @@ angular.module('confjuvapp.controllers', []) | ||
124 | }; | 124 | }; |
125 | 125 | ||
126 | $scope.loginCallback = function(token) { | 126 | $scope.loginCallback = function(token) { |
127 | + $scope.topics = []; | ||
128 | + $scope.cards = []; | ||
129 | + $scope.topicFilter = { value: ConfJuvAppUtils.getTopicFilter() }; | ||
130 | + $scope.emptyTopicsCount = $scope.topicFilter.value == 'all' ? 0 : 10; | ||
131 | + | ||
127 | $scope.loggedIn = true; | 132 | $scope.loggedIn = true; |
128 | $scope.token = token; | 133 | $scope.token = token; |
129 | ConfJuvAppUtils.setPrivateToken(token); | 134 | ConfJuvAppUtils.setPrivateToken(token); |
@@ -332,12 +337,12 @@ angular.module('confjuvapp.controllers', []) | @@ -332,12 +337,12 @@ angular.module('confjuvapp.controllers', []) | ||
332 | 337 | ||
333 | $scope.topics = []; | 338 | $scope.topics = []; |
334 | $scope.cards = []; | 339 | $scope.cards = []; |
335 | - $scope.emptyTopicsCount = 0; | ||
336 | - //FIXME refatoring this variable to make the proposals filters more generic | ||
337 | - $scope.proposalsFilter = ''; | ||
338 | $scope.topicFilter = { value: ConfJuvAppUtils.getTopicFilter() }; | 340 | $scope.topicFilter = { value: ConfJuvAppUtils.getTopicFilter() }; |
339 | $scope.emptyTopicsCount = $scope.topicFilter.value == 'all' ? 0 : 10; | 341 | $scope.emptyTopicsCount = $scope.topicFilter.value == 'all' ? 0 : 10; |
340 | 342 | ||
343 | + // FIXME Make the proposals filters more generic | ||
344 | + $scope.proposalsFilter = ''; | ||
345 | + | ||
341 | $scope.reloadTopics = function() { | 346 | $scope.reloadTopics = function() { |
342 | $scope.emptyTopicsCount = 0; | 347 | $scope.emptyTopicsCount = 0; |
343 | 348 |