You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by je...@apache.org on 2015/08/13 20:07:15 UTC
[48/50] allura git commit: [#7922] ticket:834 Fix admin/tools menu
display when wiki left bar is hidden
[#7922] ticket:834 Fix admin/tools menu display when wiki left bar is hidden
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/2e970fac
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/2e970fac
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/2e970fac
Branch: refs/heads/ib/7922
Commit: 2e970fac13e9c2278d743529cdaf8a9608bd62c5
Parents: 858c38f
Author: Igor Bondarenko <je...@gmail.com>
Authored: Thu Aug 13 19:13:46 2015 +0300
Committer: Igor Bondarenko <je...@gmail.com>
Committed: Thu Aug 13 19:13:46 2015 +0300
----------------------------------------------------------------------
ForgeWiki/forgewiki/wiki_main.py | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/2e970fac/ForgeWiki/forgewiki/wiki_main.py
----------------------------------------------------------------------
diff --git a/ForgeWiki/forgewiki/wiki_main.py b/ForgeWiki/forgewiki/wiki_main.py
index ce99198..6542215 100644
--- a/ForgeWiki/forgewiki/wiki_main.py
+++ b/ForgeWiki/forgewiki/wiki_main.py
@@ -232,7 +232,7 @@ The wiki uses [Markdown](%s) syntax.
SitemapEntry('Wiki Home', self.url, className='wiki_home')]
links += [SitemapEntry('Browse Pages', self.url + 'browse_pages/'),
SitemapEntry('Browse Labels', self.url + 'browse_tags/')]
- discussion = c.app.config.discussion
+ discussion = self.config.discussion
pending_mod_count = M.Post.query.find({
'discussion_id': discussion._id,
'status': 'pending',
@@ -250,8 +250,9 @@ The wiki uses [Markdown](%s) syntax.
subscribe_action.capitalize(),
'' if subscribed else ' to wiki')
subscribe_url = '{}#toggle-subscribe'.format(self.url)
- links += [SitemapEntry(''),
- SitemapEntry(subscribe_title, subscribe_url, ui_icon=g.icons['mail'])]
+ if not admin_menu:
+ links.append(SitemapEntry(None))
+ links.append(SitemapEntry(subscribe_title, subscribe_url, ui_icon=g.icons['mail']))
if not admin_menu:
links += [SitemapEntry(''),
SitemapEntry('Formatting Help', self.url + 'markdown_syntax/')]