You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by jo...@apache.org on 2013/12/16 18:09:57 UTC
[18/36] git commit: [#6831] Minor fixes
[#6831] Minor fixes
- No trailing slash on feed urls
- Not all activity_extras dicts will have a 'summary' key
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/bad824c9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/bad824c9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/bad824c9
Branch: refs/heads/cj/6821
Commit: bad824c934a51bd107047a8e43de2b061de04a96
Parents: 3328dc0
Author: Tim Van Steenburgh <tv...@gmail.com>
Authored: Thu Dec 12 06:08:09 2013 +0000
Committer: Tim Van Steenburgh <tv...@gmail.com>
Committed: Thu Dec 12 06:08:09 2013 +0000
----------------------------------------------------------------------
ForgeActivity/forgeactivity/main.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/bad824c9/ForgeActivity/forgeactivity/main.py
----------------------------------------------------------------------
diff --git a/ForgeActivity/forgeactivity/main.py b/ForgeActivity/forgeactivity/main.py
index 33be804..c1cc686 100644
--- a/ForgeActivity/forgeactivity/main.py
+++ b/ForgeActivity/forgeactivity/main.py
@@ -20,7 +20,7 @@ import logging
from pylons import tmpl_context as c, app_globals as g
from pylons import request, response
from tg import expose, validate, config
-from tg.decorators import with_trailing_slash
+from tg.decorators import with_trailing_slash, without_trailing_slash
from paste.deploy.converters import asbool
from webob import exc
from webhelpers import feedgenerator as FG
@@ -109,7 +109,7 @@ class ForgeActivityController(BaseController):
def index(self, **kw):
return self._get_activities_data(**kw)
- @with_trailing_slash
+ @without_trailing_slash
@expose()
def feed(self, **kw):
data = self._get_activities_data(**kw)
@@ -135,7 +135,7 @@ class ForgeActivityController(BaseController):
),
link=url,
pubdate=t.published,
- description=t.obj.activity_extras.summary,
+ description=t.obj.activity_extras.get('summary'),
unique_id=url,
author_name=t.actor.activity_name,
author_link=h.absurl(t.actor.activity_url))