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 2014/02/07 23:07:48 UTC
[2/2] git commit: [#7156] remove activitystream.enabled cookie
override
[#7156] remove activitystream.enabled cookie override
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/992324db
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/992324db
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/992324db
Branch: refs/heads/db/7156
Commit: 992324dbff236cff4ceb3092fd4c807587efce4b
Parents: aa3f0a8
Author: Dave Brondsema <db...@slashdotmedia.com>
Authored: Fri Feb 7 22:02:27 2014 +0000
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Fri Feb 7 22:02:27 2014 +0000
----------------------------------------------------------------------
Allura/allura/controllers/project.py | 5 +----
ForgeActivity/forgeactivity/main.py | 15 +++------------
.../forgeactivity/tests/functional/test_root.py | 6 ------
3 files changed, 4 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/992324db/Allura/allura/controllers/project.py
----------------------------------------------------------------------
diff --git a/Allura/allura/controllers/project.py b/Allura/allura/controllers/project.py
index 2b48697..b83e881 100644
--- a/Allura/allura/controllers/project.py
+++ b/Allura/allura/controllers/project.py
@@ -394,10 +394,7 @@ class ProjectController(FeedController):
@with_trailing_slash
def index(self, **kw):
mount = c.project.first_mount_visible(c.user)
- activity_enabled = config.get('activitystream.enabled', False)
- activity_enabled = request.cookies.get(
- 'activitystream.enabled', activity_enabled)
- activity_enabled = asbool(activity_enabled)
+ activity_enabled = asbool(config.get('activitystream.enabled', False))
if mount is not None:
if 'ac' in mount:
redirect(mount['ac'].options.mount_point + '/')
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/992324db/ForgeActivity/forgeactivity/main.py
----------------------------------------------------------------------
diff --git a/ForgeActivity/forgeactivity/main.py b/ForgeActivity/forgeactivity/main.py
index 8a34732..4df5dbe 100644
--- a/ForgeActivity/forgeactivity/main.py
+++ b/ForgeActivity/forgeactivity/main.py
@@ -85,10 +85,7 @@ class ForgeActivityController(BaseController):
g.register_app_css('css/activity.css', app=self.app)
def _get_activities_data(self, **kw):
- activity_enabled = config.get('activitystream.enabled', False)
- activity_enabled = request.cookies.get(
- 'activitystream.enabled', activity_enabled)
- activity_enabled = asbool(activity_enabled)
+ activity_enabled = asbool(config.get('activitystream.enabled', False))
if not activity_enabled:
raise exc.HTTPNotFound()
@@ -162,10 +159,7 @@ class ForgeActivityController(BaseController):
@expose('json:')
@validate(W.follow_toggle)
def follow(self, follow, **kw):
- activity_enabled = config.get('activitystream.enabled', False)
- activity_enabled = request.cookies.get(
- 'activitystream.enabled', activity_enabled)
- activity_enabled = asbool(activity_enabled)
+ activity_enabled = asbool(config.get('activitystream.enabled', False))
if not activity_enabled:
raise exc.HTTPNotFound()
@@ -229,10 +223,7 @@ class ForgeActivityProfileSection(ProfileSectionBase):
def check_display(self):
app_installed = self.activity_app is not None
- activity_enabled = config.get('activitystream.enabled', False)
- activity_enabled = request.cookies.get(
- 'activitystream.enabled', activity_enabled)
- activity_enabled = asbool(activity_enabled)
+ activity_enabled = asbool(config.get('activitystream.enabled', False))
return app_installed and activity_enabled
def prepare_context(self, context):
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/992324db/ForgeActivity/forgeactivity/tests/functional/test_root.py
----------------------------------------------------------------------
diff --git a/ForgeActivity/forgeactivity/tests/functional/test_root.py b/ForgeActivity/forgeactivity/tests/functional/test_root.py
index 93f2eab..2074866 100644
--- a/ForgeActivity/forgeactivity/tests/functional/test_root.py
+++ b/ForgeActivity/forgeactivity/tests/functional/test_root.py
@@ -47,12 +47,6 @@ class TestActivityController(TestController):
config['activitystream.enabled'] = 'false'
self.app.get('/activity/', status=404)
- def test_index_override(self):
- config['activitystream.enabled'] = 'false'
- self.app.cookies['activitystream.enabled'] = 'true'
- resp = self.app.get('/activity/')
- assert 'No activity to display.' in resp
-
@td.with_tool('test', 'activity')
@patch('forgeactivity.main.g.director')
def test_index_html(self, director):