Start of unification of comment and activity streams.

This commit is contained in:
2016-11-02 15:41:07 +01:00
parent 2afb41d00f
commit 733d213ea4
6 changed files with 69 additions and 9 deletions

View File

@@ -139,8 +139,10 @@ def activity_after_replacing_task(task, original):
human_key = pillar.web.jinja.format_undertitle(key.rsplit('.', 1)[-1])
descr = None
# Some key-specific overrides
if key == 'properties.status':
# Some key- and value-specific overrides
if val_task is pillar.api.utils.DoesNotExist:
descr = 'removed "%s" from shot "%s"' % (human_key, task['name'])
elif key == 'properties.status':
val_task = pillar.web.jinja.format_undertitle(val_task)
elif key == 'properties.assigned_to.users':
human_key = 'assigned users'
@@ -148,6 +150,7 @@ def activity_after_replacing_task(task, original):
descr = 'assigned task "%s" to %s' % (task['name'], val_task)
elif isinstance(val_task, basestring) and len(val_task) > 80:
val_task = val_task[:80] + u''
if descr is None:
descr = 'changed %s to "%s" in task "%s"' % (human_key, val_task, task['name'])
else: