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 2012/09/19 20:43:27 UTC
[46/50] git commit: [#4334] ticket:158 proper `index.*` dispatching
for Wiki and Discussion
[#4334] ticket:158 proper `index.*` dispatching for Wiki and Discussion
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/51e9a8fb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/51e9a8fb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/51e9a8fb
Branch: refs/heads/master
Commit: 51e9a8fb1ec87eef6585c48335fe8ec3eb45a461
Parents: 8591088
Author: Igor Bondarenko <je...@gmail.com>
Authored: Mon Sep 3 14:10:43 2012 +0300
Committer: Dave Brondsema <db...@geek.net>
Committed: Thu Sep 6 19:36:55 2012 +0000
----------------------------------------------------------------------
.../forgediscussion/controllers/root.py | 8 +++-----
ForgeWiki/forgewiki/wiki_main.py | 3 ++-
2 files changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/51e9a8fb/ForgeDiscussion/forgediscussion/controllers/root.py
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/controllers/root.py b/ForgeDiscussion/forgediscussion/controllers/root.py
index ae2e6e9..c2bfc27 100644
--- a/ForgeDiscussion/forgediscussion/controllers/root.py
+++ b/ForgeDiscussion/forgediscussion/controllers/root.py
@@ -12,16 +12,14 @@ from pylons import g, c, request
from formencode import validators
from webob import exc
-from ming.orm.base import session
-from allura.app import Application, ConfigOption, SitemapEntry, DefaultAdminController
from allura.lib.security import require_access, has_access, require_authenticated
-from allura.model import ProjectRole, Feed
+from allura.model import Feed
from allura.lib.search import search
from allura.lib import helpers as h
from allura.lib.utils import AntiSpam
from allura.lib.decorators import require_post
-from allura.controllers import BaseController
+from allura.controllers import BaseController, DispatchIndex
from .forum import ForumController
from forgediscussion import import_support
@@ -35,7 +33,7 @@ from forgediscussion.widgets.admin import AddForumShort
log = logging.getLogger(__name__)
-class RootController(BaseController):
+class RootController(BaseController, DispatchIndex):
class W(object):
forum_subscription_form=FW.ForumSubscriptionForm()
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/51e9a8fb/ForgeWiki/forgewiki/wiki_main.py
----------------------------------------------------------------------
diff --git a/ForgeWiki/forgewiki/wiki_main.py b/ForgeWiki/forgewiki/wiki_main.py
index 4bcf65f..ab56690 100644
--- a/ForgeWiki/forgewiki/wiki_main.py
+++ b/ForgeWiki/forgewiki/wiki_main.py
@@ -21,6 +21,7 @@ from allura.lib.search import search
from allura.lib.decorators import require_post, Property
from allura.lib.security import require_access, has_access
from allura.controllers import AppDiscussionController, BaseController
+from allura.controllers import DispatchIndex
from allura.controllers import attachments as ac
from allura.lib import widgets as w
from allura.lib.widgets import form_fields as ffw
@@ -248,7 +249,7 @@ The wiki uses [Markdown](%s) syntax.
WM.Globals.query.remove(dict(app_config_id=self.config._id))
super(ForgeWikiApp, self).uninstall(project)
-class RootController(BaseController):
+class RootController(BaseController, DispatchIndex):
def __init__(self):
setattr(self, 'feed.atom', self.feed)