Return-Path: X-Original-To: apmail-incubator-allura-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-allura-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B82BDE414 for ; Tue, 4 Dec 2012 14:26:17 +0000 (UTC) Received: (qmail 61606 invoked by uid 500); 4 Dec 2012 14:26:17 -0000 Delivered-To: apmail-incubator-allura-commits-archive@incubator.apache.org Received: (qmail 61544 invoked by uid 500); 4 Dec 2012 14:26:17 -0000 Mailing-List: contact allura-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: allura-dev@incubator.apache.org Delivered-To: mailing list allura-commits@incubator.apache.org Received: (qmail 60069 invoked by uid 99); 4 Dec 2012 14:26:15 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Dec 2012 14:26:15 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 366538182A0; Tue, 4 Dec 2012 14:26:15 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tvansteenburgh@apache.org To: allura-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [28/29] git commit: [#5359] add **kw to blog controllers Message-Id: <20121204142615.366538182A0@tyr.zones.apache.org> Date: Tue, 4 Dec 2012 14:26:15 +0000 (UTC) [#5359] add **kw to blog controllers Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/8ae6302b Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/8ae6302b Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/8ae6302b Branch: refs/heads/tv/5382 Commit: 8ae6302bca26efb135fa3e20e84f3d398c5a9049 Parents: 5bb52b7 Author: Dave Brondsema Authored: Wed Nov 28 19:44:14 2012 +0000 Committer: Cory Johns Committed: Mon Dec 3 15:40:33 2012 +0000 ---------------------------------------------------------------------- ForgeBlog/forgeblog/main.py | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/8ae6302b/ForgeBlog/forgeblog/main.py ---------------------------------------------------------------------- diff --git a/ForgeBlog/forgeblog/main.py b/ForgeBlog/forgeblog/main.py index fd42702..3b46f42 100644 --- a/ForgeBlog/forgeblog/main.py +++ b/ForgeBlog/forgeblog/main.py @@ -255,7 +255,7 @@ class RootController(BaseController): @with_trailing_slash @expose('jinja:allura:templates/markdown_syntax_dialog.html') - def markdown_syntax_dialog(self): + def markdown_syntax_dialog(self, **kw): 'Static dialog page about how to use markdown.' return dict() @@ -307,13 +307,13 @@ class PostController(BaseController): @without_trailing_slash @expose('jinja:forgeblog:templates/blog/post_history.html') - def history(self): + def history(self, **kw): posts = self.post.history() return dict(title=self.post.title, posts=posts) @without_trailing_slash @expose('jinja:forgeblog:templates/blog/post_diff.html') - def diff(self, v1, v2): + def diff(self, v1, v2, **kw): p1 = self._get_version(int(v1)) p2 = self._get_version(int(v2)) result = h.diff_text(p1.text, p2.text) @@ -337,7 +337,7 @@ class PostController(BaseController): @without_trailing_slash @require_post() @expose() - def revert(self, version): + def revert(self, version, **kw): require_access(self.post, 'write') orig = self._get_version(version) if orig: @@ -347,7 +347,7 @@ class PostController(BaseController): @expose() @validate(W.subscribe_form) - def subscribe(self, subscribe=None, unsubscribe=None): + def subscribe(self, subscribe=None, unsubscribe=None, **kw): if subscribe: self.post.subscribe(type='direct') elif unsubscribe: