提交: 02c18ffcbcf43f32828301fee0827f0bd60a2c66 - allura (git)

allura

Commit MetaInfo

• 修訂: 02c18ffcbcf43f32828301fee0827f0bd60a2c66 (tree)
• 時間: 2012-06-29 00:18:49
• 作者: Tim Van Steenburgh <tvansteenburgh@gmai...>
• Commiter: Tim Van Steenburgh

Log Message

[#4458] Updates in preparation for putting ActivityStream in prod.

1. Removed old follow and timeline controller methods (replaced by

ForgeActivity). Left the timeline html in the code since we may
want to reuse it in ForgeActivity. Left one activity creation
call in (happens when new ticket created) since it doesn't affect
the UI, and it'll be nice to have a little data gathered.

2. Updated activitystream.enabled config param name to match the

others.

Signed-off-by: Tim Van Steenburgh <[e-mail]>

Change Summary

• modified: Allura/allura/controllers/project.py
• modified: Allura/allura/ext/user_profile/user_main.py
• modified: Allura/allura/tests/functional/test_root.py
• modified: ForgeActivity/forgeactivity/main.py
• modified: ForgeActivity/forgeactivity/tests/functional/test_root.py

差異

--- a/Allura/allura/controllers/project.py
+++ b/Allura/allura/controllers/project.py
@@ -280,7 +280,7 @@ class ProjectController(object):
     @with_trailing_slash
     def index(self, **kw):
         mount = c.project.first_mount('read')
-        activity_enabled = asbool(config.get('activity_stream.enabled', False))
+        activity_enabled = asbool(config.get('activitystream.enabled', False))
         if activity_enabled and c.project.app_instance('activity'):
             redirect('activity/')
         elif mount is not None:

--- a/Allura/allura/ext/user_profile/user_main.py
+++ b/Allura/allura/ext/user_profile/user_main.py
@@ -149,20 +149,3 @@ class UserProfileController(BaseController):
                     name=div['name'],
                     content=content))
         redirect('configuration')
-
-    @expose()
-    def follow(self, username=None, **kw):
-        user = User.by_username(username)
-        if not user:
-            flash('Invalid username.', 'error')
-            redirect('.')
-        director.connect(c.user, user)
-        flash('You are now following %s.' % username)
-        redirect('.')
-
-    @expose('jinja:allura.ext.user_profile:templates/user_timeline.html')
-    def timeline(self, **kw):
-        username = c.project.shortname.split('/')[1]
-        user = User.by_username(username)
-        timeline = director.create_timeline(user)
-        return dict(timeline=timeline, user=user)

--- a/Allura/allura/tests/functional/test_root.py
+++ b/Allura/allura/tests/functional/test_root.py
@@ -64,12 +64,12 @@ class TestRootController(TestController):
         assert len(response.html.findAll('a',{'href':'/adobe/adobe-2/'})) == 0
 
     def test_project_redirect(self):
-        with push_config(config, **{'activity_stream.enabled': 'false'}):
+        with push_config(config, **{'activitystream.enabled': 'false'}):
             resp = self.app.get('/p/test2/')
             assert_equal(resp.status_int, 302)
             assert_equal(resp.location, 'http://localhost/p/test2/admin/')
 
-        with push_config(config, **{'activity_stream.enabled': 'true'}):
+        with push_config(config, **{'activitystream.enabled': 'true'}):
             resp = self.app.get('/p/test2/')
             assert_equal(resp.status_int, 302)
             assert_equal(resp.location, 'http://localhost/p/test2/activity/')

--- a/ForgeActivity/forgeactivity/main.py
+++ b/ForgeActivity/forgeactivity/main.py
@@ -58,7 +58,7 @@ class ForgeActivityController(BaseController):
     @expose('jinja:forgeactivity:templates/index.html')
     @with_trailing_slash
     def index(self, **kw):
-        activity_enabled = asbool(config.get('activity_stream.enabled', False))
+        activity_enabled = asbool(config.get('activitystream.enabled', False))
         if not activity_enabled:
             raise HTTPNotFound()
 
@@ -72,7 +72,7 @@ class ForgeActivityController(BaseController):
     @expose('json:')
     @validate(W.follow_toggle)
     def follow(self, follow, **kw):
-        activity_enabled = asbool(config.get('activity_stream.enabled', False))
+        activity_enabled = asbool(config.get('activitystream.enabled', False))
         if not activity_enabled:
             raise HTTPNotFound()
 

--- a/ForgeActivity/forgeactivity/tests/functional/test_root.py
+++ b/ForgeActivity/forgeactivity/tests/functional/test_root.py
@@ -13,17 +13,17 @@ from allura.lib.helpers import push_config
 class TestActivityController(TestController):
     def setUp(self, *args, **kwargs):
         super(TestActivityController, self).setUp(*args, **kwargs)
-        self._enabled = config.get('activity_stream.enabled', 'false')
-        config['activity_stream.enabled'] = 'true'
+        self._enabled = config.get('activitystream.enabled', 'false')
+        config['activitystream.enabled'] = 'true'
 
     def tearDown(self, *args, **kwargs):
         super(TestActivityController, self).tearDown(*args, **kwargs)
-        config['activity_stream.enabled'] = self._enabled
+        config['activitystream.enabled'] = self._enabled
 
     def test_index(self):
         resp = self.app.get('/activity/')
         assert 'Something happened.' in resp
 
     def test_index_disabled(self):
-        config['activity_stream.enabled'] = 'false'
+        config['activitystream.enabled'] = 'false'
         resp = self.app.get('/activity/', status=404)