You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by je...@apache.org on 2015/12/04 09:49:04 UTC
[2/2] allura git commit: ticket:869 updated header text for user
activity
ticket:869 updated header text for user activity
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/3c0d70a4
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/3c0d70a4
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/3c0d70a4
Branch: refs/heads/ib/7978a
Commit: 3c0d70a44e2992ffbfc9e01481d10275b9fb597e
Parents: 1d648d2
Author: DeV1doR <de...@ukr.net>
Authored: Fri Dec 4 10:23:53 2015 +0200
Committer: DeV1doR <de...@ukr.net>
Committed: Fri Dec 4 10:23:53 2015 +0200
----------------------------------------------------------------------
ForgeActivity/forgeactivity/main.py | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/3c0d70a4/ForgeActivity/forgeactivity/main.py
----------------------------------------------------------------------
diff --git a/ForgeActivity/forgeactivity/main.py b/ForgeActivity/forgeactivity/main.py
index 186528b..046b9b5 100644
--- a/ForgeActivity/forgeactivity/main.py
+++ b/ForgeActivity/forgeactivity/main.py
@@ -128,8 +128,11 @@ class ForgeActivityController(BaseController):
has_more = len(filtered_timeline) == limit
if c.project.is_user_project:
- header_text = 'Activity %s follows' % \
- c.project.user_project_of.display_name
+ if not actor_only:
+ header_text = 'Activity %s follows' % \
+ c.project.user_project_of.display_name
+ else:
+ header_text = 'Activity from your followers'
else:
header_text = 'Activity for %s' % c.project.name