incubator-allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tvansteenbu...@apache.org
Subject [08/10] git commit: [#7042] Add tags to json feed
Date Thu, 06 Feb 2014 02:40:04 GMT
[#7042] Add tags to json feed

Cleaned up inconsistency in use of related_nodes vs target

Signed-off-by: Tim Van Steenburgh <tvansteenburgh@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/36fd3c8e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/36fd3c8e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/36fd3c8e

Branch: refs/heads/tv/7042
Commit: 36fd3c8e56ba6150edc155344b2dc7bde12befdf
Parents: f295ca5
Author: Tim Van Steenburgh <tvansteenburgh@gmail.com>
Authored: Wed Feb 5 22:36:21 2014 +0000
Committer: Tim Van Steenburgh <tvansteenburgh@gmail.com>
Committed: Thu Feb 6 02:29:30 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/36fd3c8e/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/36fd3c8e/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/36fd3c8e/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')


Mime
View raw message