From 89e9d81e6497e9644f17f23a31a01c66b4167fa7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Thu, 3 Nov 2016 18:35:28 +0100 Subject: [PATCH] Handle activities for deleted objects. --- attract/routes.py | 5 ++++- src/templates/attract/index.jade | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/attract/routes.py b/attract/routes.py index 219c1a8..26ff5e0 100644 --- a/attract/routes.py +++ b/attract/routes.py @@ -53,7 +53,10 @@ def index(): for act in activities['_items']: act.actor_user = pillar.web.subquery.get_user_info(act.actor_user) act.project = id_to_proj[act.project] - act.link = current_attract.link_for_activity(act) + try: + act.link = current_attract.link_for_activity(act) + except pillarsdk.ResourceNotFound: + act.link = None return render_template('attract/index.html', tasks=tasks, diff --git a/src/templates/attract/index.jade b/src/templates/attract/index.jade index c5cc5d9..75da69f 100644 --- a/src/templates/attract/index.jade +++ b/src/templates/attract/index.jade @@ -43,11 +43,13 @@ ul | {% for act in activities['_items'] %} + | {% if act.link %} li a(href="{{ act.link }}") img.actor-avatar(src="{{ act['actor_user']['email'] | gravatar }}") span.date(title="{{ act._created }}") {{ act._created | pretty_date_time }} span.actor {{ act['actor_user']['full_name'] }} span.verb {{ act.verb }} + | {% endif %} | {% endfor %} | {% endblock %}