Merge pull request #511 from BillionOysterProject/BOP-1280

added more checks for null
BillionOysterProject · Aug 4, 2017 · 9a60d55 · 9a60d55
2 parents e026d52 + aedd8eb
commit 9a60d55
Showing 1 changed file with 16 additions and 8 deletions.
diff --git a/modules/profiles/client/controllers/user/user.client.controller.js b/modules/profiles/client/controllers/user/user.client.controller.js
@@ -145,10 +145,14 @@
           allTeamLeads = allTeamLeads.concat($scope.userTeams[i].teamLeads);
         }
 
-        var leadIndex = lodash.findIndex(allTeamLeads, function(l) {
-          return l.username === $scope.currentUser.username;
-        });
-        return (leadIndex > -1) ? true : false;
+        if ($scope.currentUser) {
+          var leadIndex = lodash.findIndex(allTeamLeads, function(l) {
+            return l.username === $scope.currentUser.username;
+          });
+          return (leadIndex > -1) ? true : false;
+        } else {
+          return false;
+        }
       } else {
         return false;
       }
@@ -163,10 +167,14 @@
           allTeamMembers = allTeamMembers.concat($scope.userTeams[i].teamMembers);
         }
 
-        var memberIndex = lodash.findIndex(allTeamMembers, function(m) {
-          return m.username === $scope.currentUser.username;
-        });
-        return (memberIndex > -1) ? true : false;
+        if ($scope.currentUser) {
+          var memberIndex = lodash.findIndex(allTeamMembers, function(m) {
+            return m.username === $scope.currentUser.username;
+          });
+          return (memberIndex > -1) ? true : false;
+        } else {
+          return false;
+        }
       } else {
         return false;
       }