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
[16/50] git commit: [#4718] make ForgeDownloads generate the same URL
in main_menu as sitemap
[#4718] make ForgeDownloads generate the same URL in main_menu as sitemap
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/879c0def
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/879c0def
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/879c0def
Branch: refs/heads/master
Commit: 879c0def315e2c5cadfb64ebf5d1287cf6934226
Parents: 191db16
Author: Dave Brondsema <db...@geek.net>
Authored: Mon Sep 10 20:56:45 2012 +0000
Committer: Cory Johns <jo...@geek.net>
Committed: Fri Sep 14 20:58:17 2012 +0000
----------------------------------------------------------------------
ForgeDownloads/forgedownloads/dl_main.py | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/879c0def/ForgeDownloads/forgedownloads/dl_main.py
----------------------------------------------------------------------
diff --git a/ForgeDownloads/forgedownloads/dl_main.py b/ForgeDownloads/forgedownloads/dl_main.py
index ab849b4..87b0f04 100644
--- a/ForgeDownloads/forgedownloads/dl_main.py
+++ b/ForgeDownloads/forgedownloads/dl_main.py
@@ -46,16 +46,15 @@ class ForgeDownloadsApp(Application):
'''Apps should provide their entries to be added to the main nav
:return: a list of :class:`SitemapEntries <allura.app.SitemapEntry>`
'''
- return [ SitemapEntry(
- self.config.options.mount_label.title(),
- '.')]
+ menu_id = self.config.options.mount_label.title()
+ url = '/projects/' + c.project.get_tool_data('sfx', 'unix_group_name') + '/files/'
+ return [SitemapEntry(menu_id, url)]
@property
@h.exceptionless([], log)
def sitemap(self):
- menu_id = self.config.options.mount_label.title()
- url='/projects/' + c.project.get_tool_data('sfx', 'unix_group_name') + '/files/'
- return [SitemapEntry(menu_id, url)[self.sidebar_menu()] ]
+ main = self.main_menu()[0]
+ return [main[self.sidebar_menu()] ]
def sidebar_menu(self):
return []
@@ -97,4 +96,3 @@ class RootController(BaseController):
d['selected'] = True
return d
return dict(menu=[ _entry(s) for s in c.project.sitemap() ] )
-