From f11926d0a9db66282035e4dd1a60869ab2557b6b Mon Sep 17 00:00:00 2001 From: Paulo Reis Date: Wed, 25 Jan 2017 10:31:02 +0000 Subject: [PATCH 1/3] Make sure layout math is done on load. --- .../public/coffee/main/project-list/project-list.coffee | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/services/web/public/coffee/main/project-list/project-list.coffee b/services/web/public/coffee/main/project-list/project-list.coffee index 431c24ada7..161598d32d 100644 --- a/services/web/public/coffee/main/project-list/project-list.coffee +++ b/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 From 2a00b9c7a2469b299fc3dd4ffd8a795b6e313118 Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Wed, 25 Jan 2017 10:33:08 +0000 Subject: [PATCH 2/3] use user._id for error log --- .../Features/Announcements/AnnouncementsController.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/web/app/coffee/Features/Announcements/AnnouncementsController.coffee b/services/web/app/coffee/Features/Announcements/AnnouncementsController.coffee index aeda79b003..a0f92c73bd 100644 --- a/services/web/app/coffee/Features/Announcements/AnnouncementsController.coffee +++ b/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, user._id}, "unable to get unread announcements" next(err) else res.json announcements From 3eb13ccdd11009560328f629640a9c73b1e3eceb Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Wed, 25 Jan 2017 10:38:39 +0000 Subject: [PATCH 3/3] fix stupid mistake --- .../Features/Announcements/AnnouncementsController.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/web/app/coffee/Features/Announcements/AnnouncementsController.coffee b/services/web/app/coffee/Features/Announcements/AnnouncementsController.coffee index a0f92c73bd..9c3a9f4deb 100644 --- a/services/web/app/coffee/Features/Announcements/AnnouncementsController.coffee +++ b/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