archive/attract
0
0
Fork 0
Code Issues 7 Pull Requests Projects Releases Wiki Activity

Handle activities for deleted objects.

Browse Source
This commit is contained in:
Sybren A. Stüvel
2016-11-03 18:35:28 +01:00
parent 8a19858b62
commit 89e9d81e64
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
attract/routes.py
View File

@@ -53,7 +53,10 @@ def index():
for act in activities['_items']: for act in activities['_items']:
act.actor_user = pillar.web.subquery.get_user_info(act.actor_user) act.actor_user = pillar.web.subquery.get_user_info(act.actor_user)
act.project = id_to_proj[act.project] 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', return render_template('attract/index.html',
tasks=tasks, tasks=tasks,

2
src/templates/attract/index.jade
View File

@@ -43,11 +43,13 @@
ul ul
| {% for act in activities['_items'] %} | {% for act in activities['_items'] %}
| {% if act.link %}
li li
a(href="{{ act.link }}") a(href="{{ act.link }}")
img.actor-avatar(src="{{ act['actor_user']['email'] | gravatar }}") img.actor-avatar(src="{{ act['actor_user']['email'] | gravatar }}")
span.date(title="{{ act._created }}") {{ act._created | pretty_date_time }} span.date(title="{{ act._created }}") {{ act._created | pretty_date_time }}
span.actor {{ act['actor_user']['full_name'] }} span.actor {{ act['actor_user']['full_name'] }}
span.verb {{ act.verb }} span.verb {{ act.verb }}
| {% endif %}
| {% endfor %} | {% endfor %}
| {% endblock %} | {% endblock %}