From ec64d1fab9dd744afb0dba6c9ccd6c398d12e53a Mon Sep 17 00:00:00 2001 From: Alasdair Smith Date: Tue, 31 Oct 2017 12:37:18 +0000 Subject: [PATCH] Combine tags with v1 tags --- .../web/app/coffee/Features/Project/ProjectController.coffee | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/services/web/app/coffee/Features/Project/ProjectController.coffee b/services/web/app/coffee/Features/Project/ProjectController.coffee index f8c0676938..2aeddd1ab6 100644 --- a/services/web/app/coffee/Features/Project/ProjectController.coffee +++ b/services/web/app/coffee/Features/Project/ProjectController.coffee @@ -166,7 +166,8 @@ module.exports = ProjectController = logger.err err:err, "error getting data for project list page" return next(err) logger.log results:results, user_id:user_id, "rendering project list" - tags = results.tags[0] + v1Tags = results.v1Projects?.tags or [] + tags = results.tags[0].concat(v1Tags) notifications = require("underscore").map results.notifications, (notification)-> notification.html = req.i18n.translate(notification.templateKey, notification.messageOpts) return notification