From cdba228d63cd41fba5acaf6f82ed0a1f359d1d95 Mon Sep 17 00:00:00 2001 From: Tom Ladendorf <tom@tomladendorf.com> Date: Mon, 16 Nov 2015 12:06:33 -0600 Subject: [PATCH 1/3] Fixed image count --- .../challenge-user-place/challenge-user-place.directive.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/directives/challenge-user-place/challenge-user-place.directive.js b/app/directives/challenge-user-place/challenge-user-place.directive.js index 5fabbc384..1942bee51 100644 --- a/app/directives/challenge-user-place/challenge-user-place.directive.js +++ b/app/directives/challenge-user-place/challenge-user-place.directive.js @@ -45,9 +45,10 @@ function activate() { $scope.numImages = 0; if (!$scope.challenge.isPrivate && $scope.challenge.userDetails.submissions && $scope.challenge.userDetails.submissions.length > 0) { - $scope.numImages = $scope.challenge.userDetails.submissions.filter(function(submission) { + $scope.challenge.userDetails.submissions = $scope.challenge.userDetails.submissions.filter(function(submission) { return submission && submission.submissionImage; - }).length; + }); + $scope.numImages = $scope.challenge.userDetails.submissions.length; $scope.selectedIndex = 0; $scope.challenge.thumbnailId = $scope.challenge.userDetails.submissions[0].id; $scope.imageURL = $scope.challenge.userDetails.submissions[0].submissionImage && $scope.challenge.userDetails.submissions[0].submissionImage.full; From bd5c23a1bd93a31ebf76d04ea43d12d364dab1d4 Mon Sep 17 00:00:00 2001 From: Tom Ladendorf <tom@tomladendorf.com> Date: Mon, 16 Nov 2015 12:10:06 -0600 Subject: [PATCH 2/3] Cleanup --- .../challenge-user-place/challenge-user-place.directive.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/directives/challenge-user-place/challenge-user-place.directive.js b/app/directives/challenge-user-place/challenge-user-place.directive.js index 1942bee51..b8b0fe657 100644 --- a/app/directives/challenge-user-place/challenge-user-place.directive.js +++ b/app/directives/challenge-user-place/challenge-user-place.directive.js @@ -44,10 +44,12 @@ function activate() { $scope.numImages = 0; - if (!$scope.challenge.isPrivate && $scope.challenge.userDetails.submissions && $scope.challenge.userDetails.submissions.length > 0) { + if ($scope.challenge.userDetails.submissions && $scope.challenge.userDetails.submissions.length > 0) { $scope.challenge.userDetails.submissions = $scope.challenge.userDetails.submissions.filter(function(submission) { return submission && submission.submissionImage; }); + } + if (!$scope.challenge.isPrivate && $scope.challenge.userDetails.submissions && $scope.challenge.userDetails.submissions.length > 0) { $scope.numImages = $scope.challenge.userDetails.submissions.length; $scope.selectedIndex = 0; $scope.challenge.thumbnailId = $scope.challenge.userDetails.submissions[0].id; From 042c28eb0615e1e28be1948814e5f9ab5ffabd27 Mon Sep 17 00:00:00 2001 From: Tom Ladendorf <tom@tomladendorf.com> Date: Tue, 17 Nov 2015 13:41:57 -0600 Subject: [PATCH 3/3] added extra check --- .../challenge-user-place/challenge-user-place.directive.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/directives/challenge-user-place/challenge-user-place.directive.js b/app/directives/challenge-user-place/challenge-user-place.directive.js index b8b0fe657..90af94e44 100644 --- a/app/directives/challenge-user-place/challenge-user-place.directive.js +++ b/app/directives/challenge-user-place/challenge-user-place.directive.js @@ -44,12 +44,12 @@ function activate() { $scope.numImages = 0; - if ($scope.challenge.userDetails.submissions && $scope.challenge.userDetails.submissions.length > 0) { + if ($scope.challenge.userDetails && $scope.challenge.userDetails.submissions && $scope.challenge.userDetails.submissions.length > 0) { $scope.challenge.userDetails.submissions = $scope.challenge.userDetails.submissions.filter(function(submission) { return submission && submission.submissionImage; }); } - if (!$scope.challenge.isPrivate && $scope.challenge.userDetails.submissions && $scope.challenge.userDetails.submissions.length > 0) { + if (!$scope.challenge.isPrivate && $scope.challenge.userDetails && $scope.challenge.userDetails.submissions && $scope.challenge.userDetails.submissions.length > 0) { $scope.numImages = $scope.challenge.userDetails.submissions.length; $scope.selectedIndex = 0; $scope.challenge.thumbnailId = $scope.challenge.userDetails.submissions[0].id;