incubator-allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brond...@apache.org
Subject [12/50] git commit: [#4718] hardcode Admin in menu_menu like the sitemap property does
Date Wed, 19 Sep 2012 18:43:27 GMT
[#4718] hardcode Admin in menu_menu like the sitemap property does


Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/f64d274e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/f64d274e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/f64d274e

Branch: refs/heads/master
Commit: f64d274ee9320d1d5c4639763850af80678fcc93
Parents: bf0997a
Author: Dave Brondsema <dbrondsema@geek.net>
Authored: Wed Sep 12 21:04:22 2012 +0000
Committer: Cory Johns <johnsca@geek.net>
Committed: Fri Sep 14 20:58:18 2012 +0000

----------------------------------------------------------------------
 Allura/allura/ext/admin/admin_main.py     |    4 +---
 Allura/allura/tests/model/test_project.py |    1 +
 2 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/f64d274e/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 12693e0..5d0d493 100644
--- a/Allura/allura/ext/admin/admin_main.py
+++ b/Allura/allura/ext/admin/admin_main.py
@@ -84,9 +84,7 @@ class AdminApp(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(),
-                '.')]
+        return [SitemapEntry('Admin', '.')]
 
     @h.exceptionless([], log)
     def sidebar_menu(self):

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/f64d274e/Allura/allura/tests/model/test_project.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/model/test_project.py b/Allura/allura/tests/model/test_project.py
index 4ff026f..b077ad5 100644
--- a/Allura/allura/tests/model/test_project.py
+++ b/Allura/allura/tests/model/test_project.py
@@ -29,6 +29,7 @@ def test_project():
     h.set_context('test/sub1', neighborhood='Projects')
     assert type(c.project.sidebar_menu()) == list
     assert type(c.project.sitemap()) == list
+    assert c.project.sitemap()[0].label == 'Admin'
     assert old_proj in list(c.project.parent_iter())
     h.set_context('test', 'wiki', neighborhood='Projects')
     adobe_nbhd = M.Neighborhood.query.get(name='Adobe')


Mime
View raw message