Преглед изворни кода

Merge branch 'master' into sk-rate-limit-cluster

Shane Kilkelly пре 9 година
родитељ
комит
e2f4fc3653

+ 1 - 1
services/web/app/coffee/Features/Announcements/AnnouncementsController.coffee

@@ -13,7 +13,7 @@ module.exports =
 		logger.log {user_id:user?._id}, "getting unread announcements"
 		AnnouncementsHandler.getUnreadAnnouncements user, (err, announcements)->
 			if err?
-				logger.err {err, user_id}, "unable to get unread announcements"
+				logger.err {err:err, user_id:user._id}, "unable to get unread announcements"
 				next(err)
 			else
 				res.json announcements

+ 3 - 4
services/web/public/coffee/main/project-list/project-list.coffee

@@ -14,10 +14,9 @@ define [
 		$scope.searchText = 
 			value : ""
 
-		if $scope.projects.length == 0
-			$timeout () ->
-				recalculateProjectListHeight()
-			, 10
+		$timeout () ->
+			recalculateProjectListHeight()
+		, 10
 
 		recalculateProjectListHeight = () ->
 			topOffset = $(".project-list-card")?.offset()?.top