You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2021/10/08 18:44:21 UTC
[allura] branch master updated: Handle historical activities with
null icon_url value
This is an automated email from the ASF dual-hosted git repository.
brondsem pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/allura.git
The following commit(s) were added to refs/heads/master by this push:
new 3fc130b Handle historical activities with null icon_url value
3fc130b is described below
commit 3fc130b7b3b858a2c00e259bed280eb606dfa4d1
Author: Dave Brondsema <db...@slashdotmedia.com>
AuthorDate: Fri Oct 8 18:42:06 2021 +0000
Handle historical activities with null icon_url value
---
ForgeActivity/forgeactivity/main.py | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/ForgeActivity/forgeactivity/main.py b/ForgeActivity/forgeactivity/main.py
index e73ecfa..f715d1f 100644
--- a/ForgeActivity/forgeactivity/main.py
+++ b/ForgeActivity/forgeactivity/main.py
@@ -127,10 +127,14 @@ class ForgeActivityController(BaseController):
filtered_timeline = list(islice(filter(perm_check(c.user), timeline),
0, limit))
- for t in filtered_timeline:
- if hasattr(t.actor.activity_extras, 'icon_url') and config.get("default_avatar_image"):
- t.actor.activity_extras.icon_url = re.sub(r'([&?])d=[^&]*', r'\1d={}'.format(config["default_avatar_image"]),
- t.actor.activity_extras.icon_url)
+ if config.get("default_avatar_image"):
+ for t in filtered_timeline:
+ if not t.actor.activity_extras.get('icon_url'):
+ t.actor.activity_extras.icon_url = config['default_avatar_image']
+ else:
+ t.actor.activity_extras.icon_url = re.sub(r'([&?])d=[^&]*',
+ r'\1d={}'.format(config["default_avatar_image"]),
+ t.actor.activity_extras.icon_url)
session(t).expunge(t) # don't save back this change
if extra_limit == limit: