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 2013/08/13 22:39:10 UTC
[6/8] git commit: [#4818] sort entry points for reliable ordering
[#4818] sort entry points for reliable ordering
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/4f7d871d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/4f7d871d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/4f7d871d
Branch: refs/heads/db/6482
Commit: 4f7d871d40186ac51502a199afa18d88d400951b
Parents: 984461a
Author: Dave Brondsema <db...@slashdotmedia.com>
Authored: Fri Aug 9 21:47:00 2013 +0000
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Tue Aug 13 20:38:42 2013 +0000
----------------------------------------------------------------------
Allura/allura/ext/admin/admin_main.py | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/4f7d871d/Allura/allura/ext/admin/admin_main.py
----------------------------------------------------------------------
diff --git a/Allura/allura/ext/admin/admin_main.py b/Allura/allura/ext/admin/admin_main.py
index 98a34c8..06aaec1 100644
--- a/Allura/allura/ext/admin/admin_main.py
+++ b/Allura/allura/ext/admin/admin_main.py
@@ -140,7 +140,8 @@ class AdminApp(Application):
links.append(None)
links.append(SitemapEntry('Help', nbhd_admin_url+ 'help/'))
- for name, admin_extension in g.entry_points['admin'].iteritems():
+ for ep_name in sorted(g.entry_points['admin'].keys()):
+ admin_extension = g.entry_points['admin'][ep_name]
admin_extension().update_project_sidebar_menu(links)
return links
@@ -156,7 +157,8 @@ class AdminExtensionLookup(object):
@expose()
def _lookup(self, name, *remainder):
- for ext_name, admin_extension in g.entry_points['admin'].iteritems():
+ for ep_name in sorted(g.entry_points['admin'].keys()):
+ admin_extension = g.entry_points['admin'][ep_name]
controller = admin_extension().project_admin_controllers.get(name)
if controller:
return controller(), remainder