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 B5CDA10235 for ; Fri, 9 Aug 2013 22:14:15 +0000 (UTC) Received: (qmail 34360 invoked by uid 500); 9 Aug 2013 22:14:15 -0000 Delivered-To: apmail-incubator-allura-commits-archive@incubator.apache.org Received: (qmail 34342 invoked by uid 500); 9 Aug 2013 22:14:15 -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 34334 invoked by uid 99); 9 Aug 2013 22:14: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; Fri, 09 Aug 2013 22:14:15 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 6ACD88BB414; Fri, 9 Aug 2013 22:14:15 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: brondsem@apache.org To: allura-commits@incubator.apache.org Date: Fri, 09 Aug 2013 22:14:15 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/2] git commit: [#4818] sort entry points for reliable ordering Updated Branches: refs/heads/db/6482 [created] db0bacbd2 [#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/2c2c3b48 Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/2c2c3b48 Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/2c2c3b48 Branch: refs/heads/db/6482 Commit: 2c2c3b4826895275342ebd526e39db17fbd471da Parents: a2e04b3 Author: Dave Brondsema Authored: Fri Aug 9 21:47:00 2013 +0000 Committer: Dave Brondsema Committed: Fri Aug 9 21:47:50 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/2c2c3b48/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