You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by tv...@apache.org on 2014/02/05 23:36:35 UTC
git commit: [#7042] Add tags to json feed
Updated Branches:
refs/heads/tv/7042 ac562c681 -> 4ed2a374e
[#7042] Add tags to json feed
Cleaned up inconsistency in use of related_nodes vs target
Signed-off-by: Tim Van Steenburgh <tv...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/4ed2a374
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/4ed2a374
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/4ed2a374
Branch: refs/heads/tv/7042
Commit: 4ed2a374ef4e56a88fc0bf3a9ee84c12c4a40e9b
Parents: ac562c6
Author: Tim Van Steenburgh <tv...@gmail.com>
Authored: Wed Feb 5 22:36:21 2014 +0000
Committer: Tim Van Steenburgh <tv...@gmail.com>
Committed: Wed Feb 5 22:36:21 2014 +0000
----------------------------------------------------------------------
ForgeActivity/forgeactivity/main.py | 1 +
ForgeBlog/forgeblog/model/blog.py | 2 +-
ForgeWiki/forgewiki/wiki_main.py | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/4ed2a374/ForgeActivity/forgeactivity/main.py
----------------------------------------------------------------------
diff --git a/ForgeActivity/forgeactivity/main.py b/ForgeActivity/forgeactivity/main.py
index 08c0283..8a34732 100644
--- a/ForgeActivity/forgeactivity/main.py
+++ b/ForgeActivity/forgeactivity/main.py
@@ -215,6 +215,7 @@ class ForgeActivityRestController(BaseController):
'verb': a.verb,
'obj': a.obj._deinstrument(),
'target': a.target._deinstrument(),
+ 'tags': a.tags._deinstrument(),
} for a in data['timeline']],
}
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/4ed2a374/ForgeBlog/forgeblog/model/blog.py
----------------------------------------------------------------------
diff --git a/ForgeBlog/forgeblog/model/blog.py b/ForgeBlog/forgeblog/model/blog.py
index 1c363c9..f5c6bfc 100644
--- a/ForgeBlog/forgeblog/model/blog.py
+++ b/ForgeBlog/forgeblog/model/blog.py
@@ -230,7 +230,7 @@ class BlogPost(M.VersionedArtifact, ActivityObject):
def commit(self):
activity = functools.partial(g.director.create_activity, c.user,
- target=c.project, tags=['blog'])
+ related_nodes=[c.project], tags=['blog'])
self.subscribe()
super(BlogPost, self).commit()
if self.version > 1:
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/4ed2a374/ForgeWiki/forgewiki/wiki_main.py
----------------------------------------------------------------------
diff --git a/ForgeWiki/forgewiki/wiki_main.py b/ForgeWiki/forgewiki/wiki_main.py
index 9231106..51d5f13 100644
--- a/ForgeWiki/forgewiki/wiki_main.py
+++ b/ForgeWiki/forgewiki/wiki_main.py
@@ -655,7 +655,7 @@ class PageController(BaseController, FeedController):
g.spam_checker.check(text, artifact=self.page,
user=c.user, content_type='wiki')
g.director.create_activity(c.user, activity_verb, self.page,
- target=c.project, tags=['wiki'])
+ related_nodes=[c.project], tags=['wiki'])
if new_viewable_by:
if new_viewable_by == 'all':
self.page.viewable_by.append('all')